PTEROSOR/QuantumPackage
10
0
Fork 0
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-07-03 01:46:05 +02:00
Code Releases Activity

Removed etc/ninja

Browse Source
This commit is contained in:
Anthony Scemama 2020-12-04 10:40:42 +01:00
parent 0c7edfe330
commit ab9cef136a
7 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/qp_name
View File

@ -30,7 +30,7 @@ try:
from docopt import docopt from docopt import docopt
from qp_path import QP_SRC, QP_ROOT from qp_path import QP_SRC, QP_ROOT
except ImportError: except ImportError:
print("source .quantum_package.rc") print("source quantum_package.rc")
raise raise

2
bin/qp_set_frozen_core
View File

@ -49,7 +49,7 @@ import os.path
try: try:
import qp_path import qp_path
except ImportError: except ImportError:
print("source .quantum_package.rc") print("source quantum_package.rc")
raise raise
from docopt import docopt from docopt import docopt

2
bin/qp_set_frozen_large_core
View File

@ -23,7 +23,7 @@ import os.path
try: try:
import qp_path import qp_path
except ImportError: except ImportError:
print("source .quantum_package.rc") print("source quantum_package.rc")
raise raise
from docopt import docopt from docopt import docopt

13
etc/ninja.rc
View File

@ -1,13 +0,0 @@
# Configuration for the Ninja package
export NINJA=${QP_ROOT}/bin/ninja
function ninja () {
if [[ -f ${QP_ROOT}/build.ninja ]] ; then
${QP_ROOT}/bin/ninja "$@"
else
>&2 echo "Error: build.ninja does not exists.
You need to run ./configure first."
fi
}

2
etc/paths.rc
View File

@ -3,7 +3,7 @@
QP_PYTHON= QP_PYTHON=
# Load dependencies # Load dependencies
for i in ezfio.rc irpf90.rc ninja.rc ocaml.rc for i in ezfio.rc irpf90.rc ocaml.rc
do do
source $i source $i
done done

2
ocaml/TaskServer.ml
View File

@ -73,6 +73,8 @@ let hostname = lazy (
| _ -> "localhost" | _ -> "localhost"
) )
let () =
Printf.printf "%s\n%!" (Lazy.force hostname)
external get_ipv4_address_for_interface : string -> string = external get_ipv4_address_for_interface : string -> string =
"get_ipv4_address_for_interface" ;; "get_ipv4_address_for_interface" ;;

10
scripts/compilation/qp_create_ninja
View File

@ -38,7 +38,7 @@ def comp_path(path):
from qp_path import QP_ROOT, QP_SRC, QP_EZFIO from qp_path import QP_ROOT, QP_SRC, QP_EZFIO
LIB = " -lz" LIB = " -lz"
EZFIO_LIB = join("$QP_ROOT", "lib", "libezfio_irp.a") EZFIO_LIB = join("$QP_ROOT", "lib", "libezfio_irp.a")
ZMQ_LIB = join("$QP_ROOT", "lib", "libf77zmq.a") + " " + join("$QP_ROOT", "lib", "libzmq.a") + " -lstdc++ -lrt -ldl" ZMQ_LIB = join("$QP_ROOT", "lib", "libf77zmq.a") + " " + join("$QP_ROOT", "lib", "libzmq.a") + " -lstdc++ -lrt -ldl"
ROOT_BUILD_NINJA = join("$QP_ROOT", "config", "build.ninja") ROOT_BUILD_NINJA = join("$QP_ROOT", "config", "build.ninja")
@ -57,7 +57,7 @@ header = r"""#
# /_/ \__,_/ \___/ /_/|_| \__,_/ _\__, / \___/ # /_/ \__,_/ \___/ /_/|_| \__,_/ _\__, / \___/
# /____/ # /____/
# #
# https://github.com/LCPQ/quantum_package, # https://github.com/QuantumPackage/qp2,
# #
# Generated automatically by {0} # Generated automatically by {0}
# #
@ -416,7 +416,7 @@ def get_l_file_for_module(path_module):
def get_file_dependency(d_info_module): def get_file_dependency(d_info_module):
""" """
For a module return all the irp.f90 needed files For a module return all the irp.f90 needed files
""" """
d_irp = defaultdict(dict) d_irp = defaultdict(dict)
@ -711,7 +711,7 @@ def save_subninja_file(path_module):
""] ""]
path_ninja_cur = join(path_module.abs, "build.ninja") path_ninja_cur = join(path_module.abs, "build.ninja")
with open(path_ninja_cur, "w") as f: with open(path_ninja_cur, "w") as f:
f.write(header) f.write(header)
f.write("\n".join(l_string)) f.write("\n".join(l_string))
@ -851,7 +851,7 @@ if __name__ == "__main__":
# ~#~#~#~#~#~#~#~#~#~#~#~ # # ~#~#~#~#~#~#~#~#~#~#~#~ #
for module_to_compile in l_module: for module_to_compile in l_module:
if module_to_compile.rel == "dummy": if module_to_compile.rel == "dummy":
continue continue