From ab9cef136a74cdbc920e4ca2462e7b0cb81610bc Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 4 Dec 2020 10:40:42 +0100 Subject: [PATCH] Removed etc/ninja --- bin/qp_name | 2 +- bin/qp_set_frozen_core | 2 +- bin/qp_set_frozen_large_core | 2 +- etc/ninja.rc | 13 ------------- etc/paths.rc | 2 +- ocaml/TaskServer.ml | 2 ++ scripts/compilation/qp_create_ninja | 10 +++++----- 7 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 etc/ninja.rc diff --git a/bin/qp_name b/bin/qp_name index d15e16d0..e13b9a5d 100755 --- a/bin/qp_name +++ b/bin/qp_name @@ -30,7 +30,7 @@ try: from docopt import docopt from qp_path import QP_SRC, QP_ROOT except ImportError: - print("source .quantum_package.rc") + print("source quantum_package.rc") raise diff --git a/bin/qp_set_frozen_core b/bin/qp_set_frozen_core index b00797e2..879c71de 100755 --- a/bin/qp_set_frozen_core +++ b/bin/qp_set_frozen_core @@ -49,7 +49,7 @@ import os.path try: import qp_path except ImportError: - print("source .quantum_package.rc") + print("source quantum_package.rc") raise from docopt import docopt diff --git a/bin/qp_set_frozen_large_core b/bin/qp_set_frozen_large_core index 6950b90c..92df4118 100755 --- a/bin/qp_set_frozen_large_core +++ b/bin/qp_set_frozen_large_core @@ -23,7 +23,7 @@ import os.path try: import qp_path except ImportError: - print("source .quantum_package.rc") + print("source quantum_package.rc") raise from docopt import docopt diff --git a/etc/ninja.rc b/etc/ninja.rc deleted file mode 100644 index 0ac28966..00000000 --- a/etc/ninja.rc +++ /dev/null @@ -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 - -} diff --git a/etc/paths.rc b/etc/paths.rc index 366286d7..aff62f6e 100644 --- a/etc/paths.rc +++ b/etc/paths.rc @@ -3,7 +3,7 @@ QP_PYTHON= # Load dependencies -for i in ezfio.rc irpf90.rc ninja.rc ocaml.rc +for i in ezfio.rc irpf90.rc ocaml.rc do source $i done diff --git a/ocaml/TaskServer.ml b/ocaml/TaskServer.ml index 92a6f5ca..31749dae 100644 --- a/ocaml/TaskServer.ml +++ b/ocaml/TaskServer.ml @@ -73,6 +73,8 @@ let hostname = lazy ( | _ -> "localhost" ) +let () = + Printf.printf "%s\n%!" (Lazy.force hostname) external get_ipv4_address_for_interface : string -> string = "get_ipv4_address_for_interface" ;; diff --git a/scripts/compilation/qp_create_ninja b/scripts/compilation/qp_create_ninja index 3d4e56dc..ad61d363 100755 --- a/scripts/compilation/qp_create_ninja +++ b/scripts/compilation/qp_create_ninja @@ -38,7 +38,7 @@ def comp_path(path): from qp_path import QP_ROOT, QP_SRC, QP_EZFIO -LIB = " -lz" +LIB = " -lz" 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" 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} # @@ -416,7 +416,7 @@ def get_l_file_for_module(path_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) @@ -711,7 +711,7 @@ def save_subninja_file(path_module): ""] path_ninja_cur = join(path_module.abs, "build.ninja") - + with open(path_ninja_cur, "w") as f: f.write(header) f.write("\n".join(l_string)) @@ -851,7 +851,7 @@ if __name__ == "__main__": # ~#~#~#~#~#~#~#~#~#~#~#~ # for module_to_compile in l_module: - + if module_to_compile.rel == "dummy": continue