From 937b8c1a5544e8a00ef8bbd40b17fb958e2949c3 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 14 Jan 2019 12:57:48 -0600 Subject: [PATCH] added more modules to cc test --- rt/cc/err.txt | 85 +++++++++++++++++++++-------- rt/cc/mf/Core/gcccore/.5.4.0.lua | 17 ++++++ rt/cc/mf/Core/gcccore/.7.3.0.lua | 32 +++++++++++ rt/cc/mf/Core/icc/.2016.4.258.lua | 18 ++++++ rt/cc/mf/Core/icc/.2018.3.222.lua | 19 +++++++ rt/cc/mf/Core/ifort/.2016.4.258.lua | 19 +++++++ rt/cc/mf/Core/ifort/.2018.3.222.lua | 19 +++++++ rt/cc/mf/Core/iimkl/.2016.4.lua | 13 +++++ rt/cc/mf/Core/iimkl/.2018.3.lua | 27 +++++++++ rt/cc/mf/Core/imkl/11.3.4.258.lua | 21 +++++++ rt/cc/mf/Core/imkl/2018.3.222.lua | 20 +++++++ rt/cc/mf/Core/intel/2016.4.lua | 8 +++ rt/cc/mf/Core/intel/2018.3.lua | 7 +++ rt/cc/mf/modules/StdEnv/2016.4.lua | 1 + rt/cc/mf/modules/StdEnv/2018.3.lua | 1 + rt/cc/out.txt | 82 ++++++++++++++++++++++------ src/Master.lua | 8 ++- 17 files changed, 355 insertions(+), 42 deletions(-) create mode 100644 rt/cc/mf/Core/gcccore/.5.4.0.lua create mode 100644 rt/cc/mf/Core/gcccore/.7.3.0.lua create mode 100644 rt/cc/mf/Core/icc/.2016.4.258.lua create mode 100644 rt/cc/mf/Core/icc/.2018.3.222.lua create mode 100644 rt/cc/mf/Core/ifort/.2016.4.258.lua create mode 100644 rt/cc/mf/Core/ifort/.2018.3.222.lua create mode 100644 rt/cc/mf/Core/iimkl/.2016.4.lua create mode 100644 rt/cc/mf/Core/iimkl/.2018.3.lua create mode 100644 rt/cc/mf/Core/imkl/11.3.4.258.lua create mode 100644 rt/cc/mf/Core/imkl/2018.3.222.lua diff --git a/rt/cc/err.txt b/rt/cc/err.txt index b7fc7ae34..0a3367143 100644 --- a/rt/cc/err.txt +++ b/rt/cc/err.txt @@ -2,7 +2,7 @@ step 1 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version =========================== -Modules based on Lua: Version 7.8.12 2019-01-08 16:15 -06:00 +Modules based on Lua: Version 7.8.13 2019-01-11 16:06 -06:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 @@ -24,7 +24,11 @@ step 4 lua ProjectDIR/src/lmod.in.lua bash --regression_testing list =========================== Currently Loaded Modules: - 1) nixpkgs/16.09 2) intel/2016.4 3) StdEnv/2016.4 + 1) nixpkgs/16.09 4) ifort/.2016.4.258 (H) 7) StdEnv/2016.4 + 2) gcccore/.5.4.0 (H) 5) imkl/11.3.4.258 + 3) icc/.2016.4.258 (H) 6) intel/2016.4 + Where: + H: Hidden Module =========================== step 5 lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T load arch/avx512 @@ -32,38 +36,71 @@ lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T load arch/avx512 running: module --regression_testing -T load arch/avx512 (1)Loading: arch/avx512 (fn: ProjectDIR/rt/cc/mf/modules/arch/avx512.lua, using Find-Best) Prepending: ProjectDIR/rt/cc/mf/modules-avx512 to MODULEPATH - reloadAll(nixpkgs/16.09, intel/2016.4, StdEnv, arch/avx512) + reloadAll(nixpkgs/16.09, gcccore/.5.4.0, icc/.2016.4.258, ifort/.2016.4.258, imkl/11.3.4.258, intel/2016.4, StdEnv, arch/avx512) (2)Unloading: nixpkgs/16.09 (status: active) (fn: ProjectDIR/rt/cc/mf/modules/nixpkgs/16.09.lua) Removing: ProjectDIR/rt/cc/mf/Core-avx512 from MODULEPATH - reloadAll(intel/2016.4, StdEnv, arch/avx512) - (3)Unloading: intel/2016.4 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/intel/2016.4.lua) - (4)Unloading: StdEnv (status: active) (fn: ProjectDIR/rt/cc/mf/modules/StdEnv/2016.4.lua) - (5)Unloading: nixpkgs/16.09 (status: ) (fn: nil) - (6)Unloading: intel/2016.4 (status: ) (fn: nil) - (7)Loading: StdEnv (fn: ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua, using Find-Best) - (8)Loading: nixpkgs/16.09 (fn: ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua, using Find-Best) + reloadAll(gcccore/.5.4.0, icc/.2016.4.258, ifort/.2016.4.258, imkl/11.3.4.258, intel/2016.4, StdEnv, arch/avx512) + (3)Unloading: gcccore/.5.4.0 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.5.4.0.lua) + (4)Unloading: icc/.2016.4.258 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/icc/.2016.4.258.lua) + (5)Unloading: gcccore/.5.4.0 (status: ) (fn: nil) + (6)Unloading: ifort/.2016.4.258 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2016.4.258.lua) + (7)Unloading: imkl/11.3.4.258 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/imkl/11.3.4.258.lua) + (8)Unloading: intel/2016.4 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/intel/2016.4.lua) + (9)Unloading: StdEnv (status: active) (fn: ProjectDIR/rt/cc/mf/modules/StdEnv/2016.4.lua) + (10)Unloading: nixpkgs/16.09 (status: ) (fn: nil) + (11)Unloading: imkl/11.3.4.258 (status: ) (fn: nil) + (12)Unloading: intel/2016.4 (status: ) (fn: nil) + (13)Loading: StdEnv (fn: ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua, using Find-Best) + (14)Loading: nixpkgs/16.09 (fn: ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua, using Find-Best) Prepending: ProjectDIR/rt/cc/mf/Core-avx512 to MODULEPATH - (9)Loading: intel/2018.3 (fn: ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua, using Find-Best) - reloadAll(arch/avx512, nixpkgs/16.09, intel/2018.3, StdEnv) - (10)Loading: nixpkgs/16.09 (fn: ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua, using Find-Best) - (11)Unloading: nixpkgs (status: active) (fn: ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua) + (15)Loading: imkl/2018.3.222 (fn: ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua, using Find-Best) + (16)Loading: intel/2018.3 (fn: ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua, using Find-Best) + (17)Loading: icc/.2018.3.222 (fn: ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua, using Find-Best) + (18)Loading: gcccore/.7.3.0 (fn: ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua, using Find-Best) + (19)Loading: ifort/.2018.3.222 (fn: ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua, using Find-Best) + (20)Loading: imkl/2018.3.222 (fn: ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua, using Find-Best) + (21)Unloading: imkl (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua) + (22)Loading: imkl/2018.3.222 (fn: ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua, using Find-Best) + reloadAll(arch/avx512, nixpkgs/16.09, gcccore/.7.3.0, icc/.2018.3.222, ifort/.2018.3.222, imkl/2018.3.222, intel/2018.3, StdEnv) + (23)Loading: nixpkgs/16.09 (fn: ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua, using Find-Best) + (24)Unloading: nixpkgs (status: active) (fn: ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua) Removing: ProjectDIR/rt/cc/mf/Core-avx512 from MODULEPATH - reloadAll(arch/avx512, intel/2018.3, StdEnv) - (12)Unloading: intel/2018.3 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua) - (13)Loading: nixpkgs/16.09 (fn: ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua, using Find-Best) + reloadAll(arch/avx512, gcccore/.7.3.0, icc/.2018.3.222, ifort/.2018.3.222, imkl/2018.3.222, intel/2018.3, StdEnv) + (25)Unloading: gcccore/.7.3.0 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua) + (26)Unloading: icc/.2018.3.222 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua) + (27)Unloading: ifort/.2018.3.222 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua) + (28)Unloading: imkl/2018.3.222 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua) + (29)Unloading: intel/2018.3 (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua) + (30)Loading: nixpkgs/16.09 (fn: ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua, using Find-Best) Prepending: ProjectDIR/rt/cc/mf/Core-avx512 to MODULEPATH - reloadAll(arch/avx512, StdEnv, nixpkgs/16.09, intel/2018.3) - (14)Loading: intel/2018.3 (fn: ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua, using Find-Best) + reloadAll(arch/avx512, StdEnv, nixpkgs/16.09, gcccore/.7.3.0, icc/.2018.3.222, ifort/.2018.3.222, imkl/2018.3.222, intel/2018.3) + (31)Loading: gcccore/.7.3.0 (fn: ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua, using Find-Best) + (32)Loading: icc/.2018.3.222 (fn: ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua, using Find-Best) + (33)Loading: ifort/.2018.3.222 (fn: ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua, using Find-Best) + (34)Loading: imkl/2018.3.222 (fn: ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua, using Find-Best) + (35)Loading: intel/2018.3 (fn: ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua, using Find-Best) + (36)Loading: imkl/2018.3.222 (fn: ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua, using Find-Best) + (37)Unloading: imkl (status: active) (fn: ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua) + (38)Loading: imkl/2018.3.222 (fn: ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua, using Find-Best) Due to MODULEPATH changes, the following have been reloaded: 1) nixpkgs/16.09 The following have been reloaded with a version change: - 1) StdEnv/2016.4 => StdEnv/2018.3 2) intel/2016.4 => intel/2018.3 + 1) StdEnv/2016.4 => StdEnv/2018.3 + 2) gcccore/.5.4.0 => gcccore/.7.3.0 + 3) icc/.2016.4.258 => icc/.2018.3.222 + 4) ifort/.2016.4.258 => ifort/.2018.3.222 + 5) imkl/11.3.4.258 => imkl/2018.3.222 + 6) intel/2016.4 => intel/2018.3 =========================== step 6 lua ProjectDIR/src/lmod.in.lua bash --regression_testing list =========================== Currently Loaded Modules: - 1) arch/avx512 2) StdEnv/2018.3 3) nixpkgs/16.09 4) intel/2018.3 + 1) arch/avx512 4) gcccore/.7.3.0 (H) 7) imkl/2018.3.222 + 2) StdEnv/2018.3 5) icc/.2018.3.222 (H) 8) intel/2018.3 + 3) nixpkgs/16.09 6) ifort/.2018.3.222 (H) + Where: + H: Hidden Module =========================== step 7 lua ProjectDIR/src/lmod.in.lua bash --regression_testing load StdEnv @@ -73,4 +110,8 @@ step 8 lua ProjectDIR/src/lmod.in.lua bash --regression_testing list =========================== Currently Loaded Modules: - 1) arch/avx512 2) nixpkgs/16.09 3) intel/2018.3 4) StdEnv/2018.3 + 1) arch/avx512 4) icc/.2018.3.222 (H) 7) intel/2018.3 + 2) nixpkgs/16.09 5) ifort/.2018.3.222 (H) 8) StdEnv/2018.3 + 3) gcccore/.7.3.0 (H) 6) imkl/2018.3.222 + Where: + H: Hidden Module diff --git a/rt/cc/mf/Core/gcccore/.5.4.0.lua b/rt/cc/mf/Core/gcccore/.5.4.0.lua new file mode 100644 index 000000000..ec7e31f68 --- /dev/null +++ b/rt/cc/mf/Core/gcccore/.5.4.0.lua @@ -0,0 +1,17 @@ +help([[ + +Description +=========== +The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, + as well as libraries for these languages (libstdc++, libgcj,...). + + +More information +================ + - Homepage: http://gcc.gnu.org/ +]]) + +local root = "/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-5.4.0" + +prepend_path("PATH", pathJoin(root, "bin")) +-- Built with EasyBuild version 3.3.0-re50b70af25207aec9b965a5c4aaa47ba992c9aa6 diff --git a/rt/cc/mf/Core/gcccore/.7.3.0.lua b/rt/cc/mf/Core/gcccore/.7.3.0.lua new file mode 100644 index 000000000..284bf1cc1 --- /dev/null +++ b/rt/cc/mf/Core/gcccore/.7.3.0.lua @@ -0,0 +1,32 @@ +help([==[ + +Description +=========== +The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, + as well as libraries for these languages (libstdc++, libgcj,...). + + +More information +================ + - Homepage: http://gcc.gnu.org/ +]==]) + +whatis([==[Description: The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, + as well as libraries for these languages (libstdc++, libgcj,...).]==]) +whatis([==[Homepage: http://gcc.gnu.org/]==]) + +local root = "/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0" + +conflict("gcccore") + +prepend_path("CPATH", pathJoin(root, "include")) +prepend_path("LIBRARY_PATH", pathJoin(root, "lib")) +prepend_path("LIBRARY_PATH", pathJoin(root, "lib64")) +prepend_path("MANPATH", pathJoin(root, "share/man")) +prepend_path("PATH", pathJoin(root, "bin")) +setenv("EBROOTGCCCORE", root) +setenv("EBVERSIONGCCCORE", "7.3.0") +setenv("EBDEVELGCCCORE", pathJoin(root, "easybuild/Core-gcccore-.7.3.0-easybuild-devel")) + +prepend_path("CPLUS_INCLUDE_PATH", pathJoin(root, "include/c++/7.3.0")) +-- Built with EasyBuild version 3.5.1-rc1513f470261f1a4fa90a8ef6bd472f15ba085ed diff --git a/rt/cc/mf/Core/icc/.2016.4.258.lua b/rt/cc/mf/Core/icc/.2016.4.258.lua new file mode 100644 index 000000000..dc61b662a --- /dev/null +++ b/rt/cc/mf/Core/icc/.2016.4.258.lua @@ -0,0 +1,18 @@ +help([==[ + +Description +=========== +C and C++ compiler from Intel + + +More information +================ + - Homepage: http://software.intel.com/en-us/intel-compilers/ +]==]) + +if not isloaded("gcccore/.5.4.0") or mode() == "unload" then + load("gcccore/.5.4.0") +end + +prepend_path("PATH", pathJoin(root, "compilers_and_libraries_2016.4.258/linux/bin/intel64")) +-- Built with EasyBuild version 3.5.0-r9c88db64dba51c4ffd22799c06090d57aaf17e38 diff --git a/rt/cc/mf/Core/icc/.2018.3.222.lua b/rt/cc/mf/Core/icc/.2018.3.222.lua new file mode 100644 index 000000000..762f06692 --- /dev/null +++ b/rt/cc/mf/Core/icc/.2018.3.222.lua @@ -0,0 +1,19 @@ +help([==[ + +Description +=========== +Intel C and C++ compilers + + +More information +================ + - Homepage: http://software.intel.com/en-us/intel-compilers/ +]==]) + +local root = "/cvmfs/restricted.computecanada.ca/easybuild/software/2017/Core/icc/2018.3.222" + + +depends_on("gcccore/.7.3.0") + +prepend_path("PATH", pathJoin(root, "compilers_and_libraries_2018.3.222/linux/bin/intel64")) +-- Built with EasyBuild version 3.6.2-r1ed7dac97acd22d6301e534c78048f7fcedaa585 diff --git a/rt/cc/mf/Core/ifort/.2016.4.258.lua b/rt/cc/mf/Core/ifort/.2016.4.258.lua new file mode 100644 index 000000000..c2db205b8 --- /dev/null +++ b/rt/cc/mf/Core/ifort/.2016.4.258.lua @@ -0,0 +1,19 @@ +help([==[ + +Description +=========== +Fortran compiler from Intel + + +More information +================ + - Homepage: http://software.intel.com/en-us/intel-compilers/ +]==]) + + +local root = "/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/ifort/2016.4.258" + +depends_on("gcccore/.5.4.0") + +prepend_path("PATH", pathJoin(root, "compilers_and_libraries_2016.4.258/linux/bin/intel64")) +-- Built with EasyBuild version 3.5.0-r9c88db64dba51c4ffd22799c06090d57aaf17e38 diff --git a/rt/cc/mf/Core/ifort/.2018.3.222.lua b/rt/cc/mf/Core/ifort/.2018.3.222.lua new file mode 100644 index 000000000..27b7b89c1 --- /dev/null +++ b/rt/cc/mf/Core/ifort/.2018.3.222.lua @@ -0,0 +1,19 @@ +help([==[ + +Description +=========== +Intel Fortran compiler + + +More information +================ + - Homepage: http://software.intel.com/en-us/intel-compilers/ +]==]) + +local root = "/cvmfs/restricted.computecanada.ca/easybuild/software/2017/Core/ifort/2018.3.222" + + +depends_on("gcccore/.7.3.0") + +prepend_path("PATH", pathJoin(root, "compilers_and_libraries_2018.3.222/linux/bin/intel64")) +-- Built with EasyBuild version 3.6.2-r1ed7dac97acd22d6301e534c78048f7fcedaa585 diff --git a/rt/cc/mf/Core/iimkl/.2016.4.lua b/rt/cc/mf/Core/iimkl/.2016.4.lua new file mode 100644 index 000000000..95dc7f9ce --- /dev/null +++ b/rt/cc/mf/Core/iimkl/.2016.4.lua @@ -0,0 +1,13 @@ +help([[Intel C/C++ and Fortran compilers, alongside Intel MKL. - Homepage: http://software.intel.com/en-us/intel-cluster-toolkit-compiler/]]) + +local root = "/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/iimkl/2016.4" + +load("icc/.2016.4.258") + +load("ifort/.2016.4.258") + +load("intel/2016.4") + +load("imkl/11.3.4.258") + +-- Built with EasyBuild version 3.1.0-rb9ec927fab948052740d84472f0a86c19bddbd87 diff --git a/rt/cc/mf/Core/iimkl/.2018.3.lua b/rt/cc/mf/Core/iimkl/.2018.3.lua new file mode 100644 index 000000000..dda7a12cb --- /dev/null +++ b/rt/cc/mf/Core/iimkl/.2018.3.lua @@ -0,0 +1,27 @@ +help([==[ + +Description +=========== +Intel C/C++ and Fortran compilers, alongside Intel MKL. + + +More information +================ + - Homepage: http://software.intel.com/en-us/intel-cluster-toolkit-compiler/ +]==]) + +whatis([==[Description: Intel C/C++ and Fortran compilers, alongside Intel MKL.]==]) +whatis([==[Homepage: http://software.intel.com/en-us/intel-cluster-toolkit-compiler/]==]) + +local root = "/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/iimkl/2018.3" + +depends_on("icc/.2018.3.222") + +depends_on("ifort/.2018.3.222") + +depends_on("intel/2018.3") + +depends_on("imkl/2018.3.222") + + +-- Built with EasyBuild version 3.7.0-rd87eb096d41e017c8f68296771c685f4d57ba80f diff --git a/rt/cc/mf/Core/imkl/11.3.4.258.lua b/rt/cc/mf/Core/imkl/11.3.4.258.lua new file mode 100644 index 000000000..72d9a5d55 --- /dev/null +++ b/rt/cc/mf/Core/imkl/11.3.4.258.lua @@ -0,0 +1,21 @@ +help([==[ + +Description +=========== +Intel Math Kernel Library is a library of highly optimized, + extensively threaded math routines for science, engineering, and financial + applications that require maximum performance. Core math functions include + BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more. + + +More information +================ + - Homepage: http://software.intel.com/en-us/intel-mkl/ +]==]) + + +local root = "/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/11.3.4.258" + +prepend_path("PATH", pathJoin(root, "bin")) +prepend_path("PATH", pathJoin(root, "mkl/bin")) +-- Built with EasyBuild version 3.6.2-r7ac096157987d9f8fad6490e41038c31790fa6ee diff --git a/rt/cc/mf/Core/imkl/2018.3.222.lua b/rt/cc/mf/Core/imkl/2018.3.222.lua new file mode 100644 index 000000000..89c5f3810 --- /dev/null +++ b/rt/cc/mf/Core/imkl/2018.3.222.lua @@ -0,0 +1,20 @@ +help([==[ + +Description +=========== +Intel Math Kernel Library is a library of highly optimized, + extensively threaded math routines for science, engineering, and financial + applications that require maximum performance. Core math functions include + BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more. + + +More information +================ + - Homepage: http://software.intel.com/en-us/intel-mkl/ +]==]) + +local root = "/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/2018.3.222" + +prepend_path("PATH", pathJoin(root, "bin")) +prepend_path("PATH", pathJoin(root, "mkl/bin")) +-- Built with EasyBuild version 3.6.2-r1ed7dac97acd22d6301e534c78048f7fcedaa585 diff --git a/rt/cc/mf/Core/intel/2016.4.lua b/rt/cc/mf/Core/intel/2016.4.lua index 62a7fb7da..e76919989 100644 --- a/rt/cc/mf/Core/intel/2016.4.lua +++ b/rt/cc/mf/Core/intel/2016.4.lua @@ -10,6 +10,14 @@ More information - Homepage: http://software.intel.com/en-us/intel-cluster-toolkit-compiler/ ]==]) +depends_on("icc/.2016.4.258") + +depends_on("ifort/.2016.4.258") + +if isloaded("imkl") then + always_load("imkl/11.3.4.258") +end + family("compiler") -- Built with EasyBuild version 3.5.0-r9c88db64dba51c4ffd22799c06090d57aaf17e38 diff --git a/rt/cc/mf/Core/intel/2018.3.lua b/rt/cc/mf/Core/intel/2018.3.lua index 328b18547..ed7502f87 100644 --- a/rt/cc/mf/Core/intel/2018.3.lua +++ b/rt/cc/mf/Core/intel/2018.3.lua @@ -9,6 +9,13 @@ More information ================ - Homepage: http://software.intel.com/en-us/intel-cluster-toolkit-compiler/ ]==]) +depends_on("icc/.2018.3.222") + +depends_on("ifort/.2018.3.222") + +if isloaded("imkl") then + always_load("imkl/2018.3.222") +end family("compiler") -- Built with EasyBuild version 3.7.0-rc7b39e420d4f1af2b79028319dfd5ed90b504390 diff --git a/rt/cc/mf/modules/StdEnv/2016.4.lua b/rt/cc/mf/modules/StdEnv/2016.4.lua index cc091e381..419a9aa5d 100644 --- a/rt/cc/mf/modules/StdEnv/2016.4.lua +++ b/rt/cc/mf/modules/StdEnv/2016.4.lua @@ -1,2 +1,3 @@ load("nixpkgs/16.09") +load("imkl/11.3.4.258") load("intel/2016.4") diff --git a/rt/cc/mf/modules/StdEnv/2018.3.lua b/rt/cc/mf/modules/StdEnv/2018.3.lua index fdbeb5efb..844ad36e9 100644 --- a/rt/cc/mf/modules/StdEnv/2018.3.lua +++ b/rt/cc/mf/modules/StdEnv/2018.3.lua @@ -1,2 +1,3 @@ load("nixpkgs/16.09") +load("imkl/2018.3.222") load("intel/2018.3") diff --git a/rt/cc/out.txt b/rt/cc/out.txt index 57c708183..42156bcbc 100644 --- a/rt/cc/out.txt +++ b/rt/cc/out.txt @@ -20,19 +20,23 @@ LMOD_FAMILY_COMPILER=intel; export LMOD_FAMILY_COMPILER; LMOD_FAMILY_COMPILER_VERSION=2016.4; export LMOD_FAMILY_COMPILER_VERSION; -__LMOD_REF_COUNT_LOADEDMODULES=nixpkgs/16.09:1\;intel/2016.4:1\;StdEnv/2016.4:1; +__LMOD_REF_COUNT_LOADEDMODULES=nixpkgs/16.09:1\;gcccore/.5.4.0:1\;icc/.2016.4.258:1\;ifort/.2016.4.258:1\;imkl/11.3.4.258:1\;intel/2016.4:1\;StdEnv/2016.4:1; export __LMOD_REF_COUNT_LOADEDMODULES; -LOADEDMODULES=nixpkgs/16.09:intel/2016.4:StdEnv/2016.4; +LOADEDMODULES=nixpkgs/16.09:gcccore/.5.4.0:icc/.2016.4.258:ifort/.2016.4.258:imkl/11.3.4.258:intel/2016.4:StdEnv/2016.4; export LOADEDMODULES; __LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/cc/mf/Core-avx512:1\;ProjectDIR/rt/cc/mf/modules:1; export __LMOD_REF_COUNT_MODULEPATH; MODULEPATH=ProjectDIR/rt/cc/mf/Core-avx512:ProjectDIR/rt/cc/mf/modules; export MODULEPATH; -__LMOD_REF_COUNT__LMFILES_=ProjectDIR/rt/cc/mf/modules/nixpkgs/16.09.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/intel/2016.4.lua:1\;ProjectDIR/rt/cc/mf/modules/StdEnv/2016.4.lua:1; +__LMOD_REF_COUNT_PATH=/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/11.3.4.258/mkl/bin:1\;/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/11.3.4.258/bin:1\;/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/ifort/2016.4.258/compilers_and_libraries_2016.4.258/linux/bin/intel64:1\;compilers_and_libraries_2016.4.258/linux/bin/intel64:1\;/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-5.4.0/bin:1\;ProjectDIR/src:1\;PATH_to_TM:1; +export __LMOD_REF_COUNT_PATH; +PATH=/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/11.3.4.258/mkl/bin:/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/11.3.4.258/bin:/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/ifort/2016.4.258/compilers_and_libraries_2016.4.258/linux/bin/intel64:compilers_and_libraries_2016.4.258/linux/bin/intel64:/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-5.4.0/bin:ProjectDIR/src:PATH_to_TM; +export PATH; +__LMOD_REF_COUNT__LMFILES_=ProjectDIR/rt/cc/mf/modules/nixpkgs/16.09.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.5.4.0.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/icc/.2016.4.258.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2016.4.258.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/imkl/11.3.4.258.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/intel/2016.4.lua:1\;ProjectDIR/rt/cc/mf/modules/StdEnv/2016.4.lua:1; export __LMOD_REF_COUNT__LMFILES_; -_LMFILES_=ProjectDIR/rt/cc/mf/modules/nixpkgs/16.09.lua:ProjectDIR/rt/cc/mf/Core-avx512/intel/2016.4.lua:ProjectDIR/rt/cc/mf/modules/StdEnv/2016.4.lua; +_LMFILES_=ProjectDIR/rt/cc/mf/modules/nixpkgs/16.09.lua:ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.5.4.0.lua:ProjectDIR/rt/cc/mf/Core-avx512/icc/.2016.4.258.lua:ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2016.4.258.lua:ProjectDIR/rt/cc/mf/Core-avx512/imkl/11.3.4.258.lua:ProjectDIR/rt/cc/mf/Core-avx512/intel/2016.4.lua:ProjectDIR/rt/cc/mf/modules/StdEnv/2016.4.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules/StdEnv/2016.4.lua",["fullName"]="StdEnv/2016.4",["loadOrder"]=3,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2016.4.lua",["fullName"]="intel/2016.4",["loadOrder"]=2,propT={},["stackDepth"]=1,["status"]="active",["userName"]="intel/2016.4",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=1,propT={},["stackDepth"]=1,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; +_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules/StdEnv/2016.4.lua",["fullName"]="StdEnv/2016.4",["loadOrder"]=7,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},gcccore={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.5.4.0.lua",["fullName"]="gcccore/.5.4.0",["loadOrder"]=2,propT={},["ref_count"]=1,["stackDepth"]=3,["status"]="active",["userName"]="gcccore/.5.4.0",},icc={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/icc/.2016.4.258.lua",["fullName"]="icc/.2016.4.258",["loadOrder"]=3,propT={},["ref_count"]=1,["stackDepth"]=2,["status"]="active",["userName"]="icc/.2016.4.258",},ifort={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2016.4.258.lua",["fullName"]="ifort/.2016.4.258",["loadOrder"]=4,propT={},["ref_count"]=1,["stackDepth"]=2,["status"]="active",["userName"]="ifort/.2016.4.258",},imkl={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/imkl/11.3.4.258.lua",["fullName"]="imkl/11.3.4.258",["loadOrder"]=5,propT={},["stackDepth"]=2,["status"]="active",["userName"]="imkl/11.3.4.258",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2016.4.lua",["fullName"]="intel/2016.4",["loadOrder"]=6,propT={},["stackDepth"]=1,["status"]="active",["userName"]="intel/2016.4",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=1,propT={},["stackDepth"]=1,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; export _ModuleTable_; =========================== step 4 @@ -40,29 +44,55 @@ lua ProjectDIR/src/lmod.in.lua bash --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/cc/mf/Core-avx512:ProjectDIR/rt/cc/mf/modules; export MODULEPATH; -_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules/StdEnv/2016.4.lua",["fullName"]="StdEnv/2016.4",["loadOrder"]=3,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2016.4.lua",["fullName"]="intel/2016.4",["loadOrder"]=2,propT={},["stackDepth"]=1,["status"]="active",["userName"]="intel/2016.4",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=1,propT={},["stackDepth"]=1,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; +_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules/StdEnv/2016.4.lua",["fullName"]="StdEnv/2016.4",["loadOrder"]=7,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},gcccore={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.5.4.0.lua",["fullName"]="gcccore/.5.4.0",["loadOrder"]=2,propT={},["ref_count"]=1,["stackDepth"]=3,["status"]="active",["userName"]="gcccore/.5.4.0",},icc={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/icc/.2016.4.258.lua",["fullName"]="icc/.2016.4.258",["loadOrder"]=3,propT={},["ref_count"]=1,["stackDepth"]=2,["status"]="active",["userName"]="icc/.2016.4.258",},ifort={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2016.4.258.lua",["fullName"]="ifort/.2016.4.258",["loadOrder"]=4,propT={},["ref_count"]=1,["stackDepth"]=2,["status"]="active",["userName"]="ifort/.2016.4.258",},imkl={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/imkl/11.3.4.258.lua",["fullName"]="imkl/11.3.4.258",["loadOrder"]=5,propT={},["stackDepth"]=2,["status"]="active",["userName"]="imkl/11.3.4.258",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2016.4.lua",["fullName"]="intel/2016.4",["loadOrder"]=6,propT={},["stackDepth"]=1,["status"]="active",["userName"]="intel/2016.4",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=1,propT={},["stackDepth"]=1,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; export _ModuleTable_; =========================== step 5 lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T load arch/avx512 =========================== +__LMOD_REF_COUNT_CPATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/include:1; +export __LMOD_REF_COUNT_CPATH; +CPATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/include; +export CPATH; +__LMOD_REF_COUNT_CPLUS_INCLUDE_PATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/include/c++/7.3.0:1; +export __LMOD_REF_COUNT_CPLUS_INCLUDE_PATH; +CPLUS_INCLUDE_PATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/include/c++/7.3.0; +export CPLUS_INCLUDE_PATH; +EBDEVELGCCCORE=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/easybuild/Core-gcccore-.7.3.0-easybuild-devel; +export EBDEVELGCCCORE; +EBROOTGCCCORE=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0; +export EBROOTGCCCORE; +EBVERSIONGCCCORE=7.3.0; +export EBVERSIONGCCCORE; +__LMOD_REF_COUNT_LIBRARY_PATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/lib64:1\;/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/lib:1; +export __LMOD_REF_COUNT_LIBRARY_PATH; +LIBRARY_PATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/lib64:/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/lib; +export LIBRARY_PATH; LMOD_FAMILY_COMPILER=intel; export LMOD_FAMILY_COMPILER; LMOD_FAMILY_COMPILER_VERSION=2018.3; export LMOD_FAMILY_COMPILER_VERSION; -__LMOD_REF_COUNT_LOADEDMODULES=arch/avx512:1\;StdEnv/2018.3:1\;nixpkgs/16.09:1\;intel/2018.3:1; +__LMOD_REF_COUNT_LOADEDMODULES=arch/avx512:1\;StdEnv/2018.3:1\;nixpkgs/16.09:1\;gcccore/.7.3.0:1\;icc/.2018.3.222:1\;ifort/.2018.3.222:1\;imkl/2018.3.222:1\;intel/2018.3:1; export __LMOD_REF_COUNT_LOADEDMODULES; -LOADEDMODULES=arch/avx512:StdEnv/2018.3:nixpkgs/16.09:intel/2018.3; +LOADEDMODULES=arch/avx512:StdEnv/2018.3:nixpkgs/16.09:gcccore/.7.3.0:icc/.2018.3.222:ifort/.2018.3.222:imkl/2018.3.222:intel/2018.3; export LOADEDMODULES; +__LMOD_REF_COUNT_MANPATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/share/man:1; +export __LMOD_REF_COUNT_MANPATH; +MANPATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/share/man; +export MANPATH; __LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/cc/mf/Core-avx512:1\;ProjectDIR/rt/cc/mf/modules-avx512:1\;ProjectDIR/rt/cc/mf/modules:1; export __LMOD_REF_COUNT_MODULEPATH; MODULEPATH=ProjectDIR/rt/cc/mf/Core-avx512:ProjectDIR/rt/cc/mf/modules-avx512:ProjectDIR/rt/cc/mf/modules; export MODULEPATH; -__LMOD_REF_COUNT__LMFILES_=ProjectDIR/rt/cc/mf/modules/arch/avx512.lua:1\;ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua:1\;ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua:1; +__LMOD_REF_COUNT_PATH=/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/2018.3.222/mkl/bin:1\;/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/2018.3.222/bin:1\;/cvmfs/restricted.computecanada.ca/easybuild/software/2017/Core/ifort/2018.3.222/compilers_and_libraries_2018.3.222/linux/bin/intel64:1\;/cvmfs/restricted.computecanada.ca/easybuild/software/2017/Core/icc/2018.3.222/compilers_and_libraries_2018.3.222/linux/bin/intel64:1\;/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/bin:1\;ProjectDIR/src:1\;PATH_to_TM:1; +export __LMOD_REF_COUNT_PATH; +PATH=/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/2018.3.222/mkl/bin:/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/2018.3.222/bin:/cvmfs/restricted.computecanada.ca/easybuild/software/2017/Core/ifort/2018.3.222/compilers_and_libraries_2018.3.222/linux/bin/intel64:/cvmfs/restricted.computecanada.ca/easybuild/software/2017/Core/icc/2018.3.222/compilers_and_libraries_2018.3.222/linux/bin/intel64:/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/bin:ProjectDIR/src:PATH_to_TM; +export PATH; +__LMOD_REF_COUNT__LMFILES_=ProjectDIR/rt/cc/mf/modules/arch/avx512.lua:1\;ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua:1\;ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua:1; export __LMOD_REF_COUNT__LMFILES_; -_LMFILES_=ProjectDIR/rt/cc/mf/modules/arch/avx512.lua:ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua:ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua:ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua; +_LMFILES_=ProjectDIR/rt/cc/mf/modules/arch/avx512.lua:ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua:ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua:ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua:ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua:ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua:ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua:ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua",["fullName"]="StdEnv/2018.3",["loadOrder"]=2,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},arch={["fn"]="ProjectDIR/rt/cc/mf/modules/arch/avx512.lua",["fullName"]="arch/avx512",["loadOrder"]=1,propT={},["stackDepth"]=0,["status"]="active",["userName"]="arch/avx512",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua",["fullName"]="intel/2018.3",["loadOrder"]=4,propT={},["stackDepth"]=0,["status"]="active",["userName"]="intel/2018.3",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=3,propT={},["stackDepth"]=0,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; +_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua",["fullName"]="StdEnv/2018.3",["loadOrder"]=2,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},arch={["fn"]="ProjectDIR/rt/cc/mf/modules/arch/avx512.lua",["fullName"]="arch/avx512",["loadOrder"]=1,propT={},["stackDepth"]=0,["status"]="active",["userName"]="arch/avx512",},gcccore={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua",["fullName"]="gcccore/.7.3.0",["loadOrder"]=4,propT={},["stackDepth"]=0,["status"]="active",["userName"]="gcccore/.7.3.0",},icc={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua",["fullName"]="icc/.2018.3.222",["loadOrder"]=5,propT={},["stackDepth"]=0,["status"]="active",["userName"]="icc/.2018.3.222",},ifort={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua",["fullName"]="ifort/.2018.3.222",["loadOrder"]=6,propT={},["stackDepth"]=0,["status"]="active",["userName"]="ifort/.2018.3.222",},imkl={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua",["fullName"]="imkl/2018.3.222",["loadOrder"]=7,propT={},["stackDepth"]=1,["status"]="active",["userName"]="imkl/2018.3.222",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua",["fullName"]="intel/2018.3",["loadOrder"]=8,propT={},["stackDepth"]=0,["status"]="active",["userName"]="intel/2018.3",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=3,propT={},["stackDepth"]=0,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; export _ModuleTable_; =========================== step 6 @@ -70,27 +100,43 @@ lua ProjectDIR/src/lmod.in.lua bash --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/cc/mf/Core-avx512:ProjectDIR/rt/cc/mf/modules-avx512:ProjectDIR/rt/cc/mf/modules; export MODULEPATH; -_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua",["fullName"]="StdEnv/2018.3",["loadOrder"]=2,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},arch={["fn"]="ProjectDIR/rt/cc/mf/modules/arch/avx512.lua",["fullName"]="arch/avx512",["loadOrder"]=1,propT={},["stackDepth"]=0,["status"]="active",["userName"]="arch/avx512",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua",["fullName"]="intel/2018.3",["loadOrder"]=4,propT={},["stackDepth"]=0,["status"]="active",["userName"]="intel/2018.3",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=3,propT={},["stackDepth"]=0,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; +_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua",["fullName"]="StdEnv/2018.3",["loadOrder"]=2,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},arch={["fn"]="ProjectDIR/rt/cc/mf/modules/arch/avx512.lua",["fullName"]="arch/avx512",["loadOrder"]=1,propT={},["stackDepth"]=0,["status"]="active",["userName"]="arch/avx512",},gcccore={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua",["fullName"]="gcccore/.7.3.0",["loadOrder"]=4,propT={},["stackDepth"]=0,["status"]="active",["userName"]="gcccore/.7.3.0",},icc={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua",["fullName"]="icc/.2018.3.222",["loadOrder"]=5,propT={},["stackDepth"]=0,["status"]="active",["userName"]="icc/.2018.3.222",},ifort={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua",["fullName"]="ifort/.2018.3.222",["loadOrder"]=6,propT={},["stackDepth"]=0,["status"]="active",["userName"]="ifort/.2018.3.222",},imkl={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua",["fullName"]="imkl/2018.3.222",["loadOrder"]=7,propT={},["stackDepth"]=1,["status"]="active",["userName"]="imkl/2018.3.222",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua",["fullName"]="intel/2018.3",["loadOrder"]=8,propT={},["stackDepth"]=0,["status"]="active",["userName"]="intel/2018.3",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=3,propT={},["stackDepth"]=0,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; export _ModuleTable_; =========================== step 7 lua ProjectDIR/src/lmod.in.lua bash --regression_testing load StdEnv =========================== +CPATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/include; +export CPATH; +CPLUS_INCLUDE_PATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/include/c++/7.3.0; +export CPLUS_INCLUDE_PATH; +EBDEVELGCCCORE=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/easybuild/Core-gcccore-.7.3.0-easybuild-devel; +export EBDEVELGCCCORE; +EBROOTGCCCORE=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0; +export EBROOTGCCCORE; +EBVERSIONGCCCORE=7.3.0; +export EBVERSIONGCCCORE; +LIBRARY_PATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/lib64:/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/lib; +export LIBRARY_PATH; LMOD_FAMILY_COMPILER=intel; export LMOD_FAMILY_COMPILER; LMOD_FAMILY_COMPILER_VERSION=2018.3; export LMOD_FAMILY_COMPILER_VERSION; -__LMOD_REF_COUNT_LOADEDMODULES=arch/avx512:1\;nixpkgs/16.09:1\;intel/2018.3:1\;StdEnv/2018.3:1; +__LMOD_REF_COUNT_LOADEDMODULES=arch/avx512:1\;nixpkgs/16.09:1\;gcccore/.7.3.0:1\;icc/.2018.3.222:1\;ifort/.2018.3.222:1\;imkl/2018.3.222:1\;intel/2018.3:1\;StdEnv/2018.3:1; export __LMOD_REF_COUNT_LOADEDMODULES; -LOADEDMODULES=arch/avx512:nixpkgs/16.09:intel/2018.3:StdEnv/2018.3; +LOADEDMODULES=arch/avx512:nixpkgs/16.09:gcccore/.7.3.0:icc/.2018.3.222:ifort/.2018.3.222:imkl/2018.3.222:intel/2018.3:StdEnv/2018.3; export LOADEDMODULES; +MANPATH=/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/share/man; +export MANPATH; MODULEPATH=ProjectDIR/rt/cc/mf/Core-avx512:ProjectDIR/rt/cc/mf/modules-avx512:ProjectDIR/rt/cc/mf/modules; export MODULEPATH; -__LMOD_REF_COUNT__LMFILES_=ProjectDIR/rt/cc/mf/modules/arch/avx512.lua:1\;ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua:1\;ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua:1; +PATH=/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/2018.3.222/mkl/bin:/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/imkl/2018.3.222/bin:/cvmfs/restricted.computecanada.ca/easybuild/software/2017/Core/ifort/2018.3.222/compilers_and_libraries_2018.3.222/linux/bin/intel64:/cvmfs/restricted.computecanada.ca/easybuild/software/2017/Core/icc/2018.3.222/compilers_and_libraries_2018.3.222/linux/bin/intel64:/cvmfs/soft.computecanada.ca/nix/var/nix/profiles/gcc-7.3.0/bin:ProjectDIR/src:PATH_to_TM; +export PATH; +__LMOD_REF_COUNT__LMFILES_=ProjectDIR/rt/cc/mf/modules/arch/avx512.lua:1\;ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua:1\;ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua:1\;ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua:1; export __LMOD_REF_COUNT__LMFILES_; -_LMFILES_=ProjectDIR/rt/cc/mf/modules/arch/avx512.lua:ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua:ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua:ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua; +_LMFILES_=ProjectDIR/rt/cc/mf/modules/arch/avx512.lua:ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua:ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua:ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua:ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua:ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua:ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua:ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua",["fullName"]="StdEnv/2018.3",["loadOrder"]=4,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},arch={["fn"]="ProjectDIR/rt/cc/mf/modules/arch/avx512.lua",["fullName"]="arch/avx512",["loadOrder"]=1,propT={},["stackDepth"]=0,["status"]="active",["userName"]="arch/avx512",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua",["fullName"]="intel/2018.3",["loadOrder"]=3,propT={},["stackDepth"]=1,["status"]="active",["userName"]="intel/2018.3",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=2,propT={},["stackDepth"]=1,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; +_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua",["fullName"]="StdEnv/2018.3",["loadOrder"]=8,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},arch={["fn"]="ProjectDIR/rt/cc/mf/modules/arch/avx512.lua",["fullName"]="arch/avx512",["loadOrder"]=1,propT={},["stackDepth"]=0,["status"]="active",["userName"]="arch/avx512",},gcccore={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua",["fullName"]="gcccore/.7.3.0",["loadOrder"]=3,propT={},["ref_count"]=2,["stackDepth"]=3,["status"]="active",["userName"]="gcccore/.7.3.0",},icc={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua",["fullName"]="icc/.2018.3.222",["loadOrder"]=4,propT={},["ref_count"]=1,["stackDepth"]=2,["status"]="active",["userName"]="icc/.2018.3.222",},ifort={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua",["fullName"]="ifort/.2018.3.222",["loadOrder"]=5,propT={},["ref_count"]=1,["stackDepth"]=2,["status"]="active",["userName"]="ifort/.2018.3.222",},imkl={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua",["fullName"]="imkl/2018.3.222",["loadOrder"]=6,propT={},["stackDepth"]=2,["status"]="active",["userName"]="imkl/2018.3.222",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua",["fullName"]="intel/2018.3",["loadOrder"]=7,propT={},["stackDepth"]=1,["status"]="active",["userName"]="intel/2018.3",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=2,propT={},["stackDepth"]=1,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; export _ModuleTable_; =========================== step 8 @@ -98,5 +144,5 @@ lua ProjectDIR/src/lmod.in.lua bash --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/cc/mf/Core-avx512:ProjectDIR/rt/cc/mf/modules-avx512:ProjectDIR/rt/cc/mf/modules; export MODULEPATH; -_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua",["fullName"]="StdEnv/2018.3",["loadOrder"]=4,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},arch={["fn"]="ProjectDIR/rt/cc/mf/modules/arch/avx512.lua",["fullName"]="arch/avx512",["loadOrder"]=1,propT={},["stackDepth"]=0,["status"]="active",["userName"]="arch/avx512",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua",["fullName"]="intel/2018.3",["loadOrder"]=3,propT={},["stackDepth"]=1,["status"]="active",["userName"]="intel/2018.3",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=2,propT={},["stackDepth"]=1,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; +_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={["compiler"]="intel",},mT={StdEnv={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/StdEnv/2018.3.lua",["fullName"]="StdEnv/2018.3",["loadOrder"]=8,propT={},["stackDepth"]=0,["status"]="active",["userName"]="StdEnv",},arch={["fn"]="ProjectDIR/rt/cc/mf/modules/arch/avx512.lua",["fullName"]="arch/avx512",["loadOrder"]=1,propT={},["stackDepth"]=0,["status"]="active",["userName"]="arch/avx512",},gcccore={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/gcccore/.7.3.0.lua",["fullName"]="gcccore/.7.3.0",["loadOrder"]=3,propT={},["ref_count"]=2,["stackDepth"]=3,["status"]="active",["userName"]="gcccore/.7.3.0",},icc={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/icc/.2018.3.222.lua",["fullName"]="icc/.2018.3.222",["loadOrder"]=4,propT={},["ref_count"]=1,["stackDepth"]=2,["status"]="active",["userName"]="icc/.2018.3.222",},ifort={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/ifort/.2018.3.222.lua",["fullName"]="ifort/.2018.3.222",["loadOrder"]=5,propT={},["ref_count"]=1,["stackDepth"]=2,["status"]="active",["userName"]="ifort/.2018.3.222",},imkl={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/imkl/2018.3.222.lua",["fullName"]="imkl/2018.3.222",["loadOrder"]=6,propT={},["stackDepth"]=2,["status"]="active",["userName"]="imkl/2018.3.222",},intel={["fn"]="ProjectDIR/rt/cc/mf/Core-avx512/intel/2018.3.lua",["fullName"]="intel/2018.3",["loadOrder"]=7,propT={},["stackDepth"]=1,["status"]="active",["userName"]="intel/2018.3",},nixpkgs={["fn"]="ProjectDIR/rt/cc/mf/modules-avx512/nixpkgs/16.09.lua",["fullName"]="nixpkgs/16.09",["loadOrder"]=2,propT={},["stackDepth"]=1,["status"]="active",["userName"]="nixpkgs/16.09",},},mpathA={"ProjectDIR/rt/cc/mf/Core-avx512","ProjectDIR/rt/cc/mf/modules-avx512","ProjectDIR/rt/cc/mf/modules",},["systemBaseMPATH"]="ProjectDIR/rt/cc/mf/modules",}'; export _ModuleTable_; diff --git a/src/Master.lua b/src/Master.lua index f4d583b7e..b2acd16ca 100644 --- a/src/Master.lua +++ b/src/Master.lua @@ -597,10 +597,14 @@ function M.reloadAll(self) local fn_old = mt:fn(sn) local fullName = mname:fullName() local userName = v.name + local mt_uName = mt:userName(sn) -- This is #issue 394 fix: only reload when the userName has remained the same. - if (fn_new ~= fn_old and mt:userName(sn) == userName) then + if (fn_new ~= fn_old and mt_uName == userName) then dbg.print{"Master:reloadAll fn_new: \"",fn_new,"\"", - " mt:fileName(sn): \"",fn_old,"\"\n"} + " mt:fileName(sn): \"",fn_old,"\"", + " mt:userName(sn): \"",mt_uName,"\"", + " a[i].userName: \"",userName,"\"", + "\n"} dbg.print{"Master:reloadAll Unloading module: \"",sn,"\"\n"} mcp:unload({mname_old}) dbg.print{"Master:reloadAll Loading module: \"",userName,"\"\n"}