diff --git a/README.new b/README.new index 96b1cf506..fb70a2d10 100644 --- a/README.new +++ b/README.new @@ -22,3 +22,5 @@ Lmod 7.8+ (7.8.14) Add Lmod version report to --trace output. (7.8.15) issue #394: use mname = MName:new("load",mt:userName(sn)) to get loadable file contrib/tracking_module_usage python scripts have been updated to support python2 and python3 + (7.8.16) Fix bug where spider reported incorrect results when a site mixed NV and NVV together in a single module. + diff --git a/rt/cc/cc.tdesc b/rt/cc/cc.tdesc index 2c9257224..8b68fede3 100644 --- a/rt/cc/cc.tdesc +++ b/rt/cc/cc.tdesc @@ -9,7 +9,7 @@ testdescript = { ]], keywords = {testName }, - active = true, + active = false, testName = testName, job_submit_method = "INTERACTIVE", diff --git a/rt/dyn/err.txt b/rt/dyn/err.txt index ab06bd605..80f748cf6 100644 --- a/rt/dyn/err.txt +++ b/rt/dyn/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.14 2019-01-14 13:30 -06:00 +Modules based on Lua: Version 7.8.15 2019-01-16 12:46 -06:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 @@ -13,24 +13,24 @@ step 3 lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T load gcc fenics =========================== running: module --regression_testing -T load gcc fenics - (1)Loading: gcc (fn: ProjectDIR/rt/dyn/mf/Core/gcc/7.1.lua, using Find-Best) + (1)(0)Loading: gcc (fn: ProjectDIR/rt/dyn/mf/Core/gcc/7.1.lua, using Find-Best) Prepending: ProjectDIR/rt/dyn/mf/Compiler/gcc/7.1 to MODULEPATH Lmod is automatically replacing "intel/18.0.1" with "gcc/7.1". - (2)Unloading: intel (status: active) (fn: ProjectDIR/rt/dyn/mf/Core/intel/18.0.1.lua) + (2)(0)Unloading: intel (status: active) (fn: ProjectDIR/rt/dyn/mf/Core/intel/18.0.1.lua) Removing: ProjectDIR/rt/dyn/mf/Compiler/intel/18.0 from MODULEPATH - (3)Unloading: gcc (status: active) (fn: ProjectDIR/rt/dyn/mf/Core/gcc/7.1.lua) + (3)(0)Unloading: gcc (status: active) (fn: ProjectDIR/rt/dyn/mf/Core/gcc/7.1.lua) Removing: ProjectDIR/rt/dyn/mf/Compiler/gcc/7.1 from MODULEPATH - (4)Loading: gcc (fn: ProjectDIR/rt/dyn/mf/Core/gcc/7.1.lua, using Find-Best) + (4)(0)Loading: gcc (fn: ProjectDIR/rt/dyn/mf/Core/gcc/7.1.lua, using Find-Best) Prepending: ProjectDIR/rt/dyn/mf/Compiler/gcc/7.1 to MODULEPATH Pushing fenics on moduleQ reloadAll(1)(impi, gcc) - (5)Unloading: impi (status: active) (fn: ProjectDIR/rt/dyn/mf/Compiler/intel/18.0/impi/18.0.1.lua) + (5)(1)Unloading: impi (status: active) (fn: ProjectDIR/rt/dyn/mf/Compiler/intel/18.0/impi/18.0.1.lua) Removing: ProjectDIR/rt/dyn/mf/MPI/intel/18.0/impi/18.0 from MODULEPATH reloadAll(2)(gcc) - (6)Loading: impi (fn: ProjectDIR/rt/dyn/mf/Compiler/gcc/7.1/impi/18.0.1.lua, using Find-Best) + (6)(1)Loading: impi (fn: ProjectDIR/rt/dyn/mf/Compiler/gcc/7.1/impi/18.0.1.lua, using Find-Best) Prepending: ProjectDIR/rt/dyn/mf/MPI/gcc/7.1/impi/18.0 to MODULEPATH reloadAll(2)(gcc, impi) - (7)Loading: fenics (fn: ProjectDIR/rt/dyn/mf/MPI/gcc/7.1/impi/18.0/fenics/1.0.lua, using Find-Best) + (7)(0)Loading: fenics (fn: ProjectDIR/rt/dyn/mf/MPI/gcc/7.1/impi/18.0/fenics/1.0.lua, using Find-Best) Due to MODULEPATH changes, the following have been reloaded: 1) impi/18.0.1 =========================== diff --git a/rt/family/err.txt b/rt/family/err.txt index e66c3e46f..9c84e2377 100644 --- a/rt/family/err.txt +++ b/rt/family/err.txt @@ -2,20 +2,20 @@ step 1 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version =========================== -Modules based on Lua: Version 7.8.14 2019-01-14 13:30 -06:00 +Modules based on Lua: Version 7.8.15 2019-01-16 12:46 -06:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T load ibmA openmpi phdf5 =========================== running: module --regression_testing -T load ibmA openmpi phdf5 - (1)Loading: ibmA (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua, using Find-Best) - (2)Loading: compiler-common/.ibm (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua, using Find-Best) + (1)(0)Loading: ibmA (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua, using Find-Best) + (2)(0)Loading: compiler-common/.ibm (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/Compiler/ibm/13 to MODULEPATH - (3)Loading: openmpi (fn: ProjectDIR/rt/family/mf/Compiler/ibm/13/openmpi/2.1.1.lua, using Find-Best) + (3)(0)Loading: openmpi (fn: ProjectDIR/rt/family/mf/Compiler/ibm/13/openmpi/2.1.1.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1 to MODULEPATH - (4)Loading: mpi-common/.openmpi (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua, using Find-Best) - (5)Loading: phdf5 (fn: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1/phdf5/1.8.18.lua, using Find-Best) + (4)(0)Loading: mpi-common/.openmpi (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua, using Find-Best) + (5)(0)Loading: phdf5 (fn: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1/phdf5/1.8.18.lua, using Find-Best) reloadAll(1)(compiler-common/.ibm, ibmA, mpi-common/.openmpi, openmpi, phdf5) =========================== step 3 @@ -31,32 +31,32 @@ step 4 lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T load gccA =========================== running: module --regression_testing -T load gccA - (1)Loading: gccA (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua, using Find-Best) - (2)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) - (3)Unloading: compiler-common (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua) - (4)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) + (1)(0)Loading: gccA (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua, using Find-Best) + (2)(0)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) + (3)(0)Unloading: compiler-common (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua) + (4)(0)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/Compiler/gcc/7 to MODULEPATH Lmod is automatically replacing "ibmA/13.1.6" with "gccA/7.1.0". - (5)Unloading: ibmA (status: active) (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua) - (6)Unloading: compiler-common/.ibm (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua) + (5)(0)Unloading: ibmA (status: active) (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua) + (6)(0)Unloading: compiler-common/.ibm (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua) Removing: ProjectDIR/rt/family/mf/Compiler/ibm/13 from MODULEPATH - (7)Unloading: gccA (status: active) (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua) - (8)Unloading: compiler-common/.gcc (status: ) (fn: nil) + (7)(0)Unloading: gccA (status: active) (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua) + (8)(0)Unloading: compiler-common/.gcc (status: ) (fn: nil) Removing: ProjectDIR/rt/family/mf/Compiler/gcc/7 from MODULEPATH - (9)Loading: gccA (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua, using Find-Best) - (10)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) + (9)(0)Loading: gccA (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua, using Find-Best) + (10)(0)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/Compiler/gcc/7 to MODULEPATH reloadAll(1)(mpi-common/.openmpi, openmpi, phdf5, compiler-common/.gcc, gccA) - (11)Unloading: openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Compiler/ibm/13/openmpi/2.1.1.lua) + (11)(1)Unloading: openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Compiler/ibm/13/openmpi/2.1.1.lua) Removing: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1 from MODULEPATH - (12)Unloading: mpi-common/.openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua) + (12)(1)Unloading: mpi-common/.openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua) reloadAll(2)(phdf5, compiler-common/.gcc, gccA) - (13)Unloading: phdf5 (status: active) (fn: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1/phdf5/1.8.18.lua) - (14)Loading: openmpi (fn: ProjectDIR/rt/family/mf/Compiler/gcc/7/openmpi/2.1.1.lua, using Find-Best) + (13)(2)Unloading: phdf5 (status: active) (fn: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1/phdf5/1.8.18.lua) + (14)(1)Loading: openmpi (fn: ProjectDIR/rt/family/mf/Compiler/gcc/7/openmpi/2.1.1.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/MPI/gcc/7/openmpi/2.1 to MODULEPATH - (15)Loading: mpi-common/.openmpi (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua, using Find-Best) + (15)(1)Loading: mpi-common/.openmpi (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua, using Find-Best) reloadAll(2)(compiler-common/.gcc, gccA, mpi-common/.openmpi, openmpi, phdf5) - (16)Loading: phdf5 (fn: ProjectDIR/rt/family/mf/MPI/gcc/7/openmpi/2.1/phdf5/1.8.18.lua, using Find-Best) + (16)(2)Loading: phdf5 (fn: ProjectDIR/rt/family/mf/MPI/gcc/7/openmpi/2.1/phdf5/1.8.18.lua, using Find-Best) Due to MODULEPATH changes, the following have been reloaded: 1) openmpi/2.1.1 2) phdf5/1.8.18 The following have been reloaded with a version change: @@ -80,32 +80,32 @@ step 6 lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T load ibmA =========================== running: module --regression_testing -T load ibmA - (1)Loading: ibmA (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua, using Find-Best) - (2)Loading: compiler-common/.ibm (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua, using Find-Best) - (3)Unloading: compiler-common (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua) - (4)Loading: compiler-common/.ibm (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua, using Find-Best) + (1)(0)Loading: ibmA (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua, using Find-Best) + (2)(0)Loading: compiler-common/.ibm (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua, using Find-Best) + (3)(0)Unloading: compiler-common (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua) + (4)(0)Loading: compiler-common/.ibm (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/Compiler/ibm/13 to MODULEPATH Lmod is automatically replacing "gccA/7.1.0" with "ibmA/13.1.6". - (5)Unloading: gccA (status: active) (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua) - (6)Unloading: compiler-common/.gcc (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua) + (5)(0)Unloading: gccA (status: active) (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua) + (6)(0)Unloading: compiler-common/.gcc (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua) Removing: ProjectDIR/rt/family/mf/Compiler/gcc/7 from MODULEPATH - (7)Unloading: ibmA (status: active) (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua) - (8)Unloading: compiler-common/.ibm (status: ) (fn: nil) + (7)(0)Unloading: ibmA (status: active) (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua) + (8)(0)Unloading: compiler-common/.ibm (status: ) (fn: nil) Removing: ProjectDIR/rt/family/mf/Compiler/ibm/13 from MODULEPATH - (9)Loading: ibmA (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua, using Find-Best) - (10)Loading: compiler-common/.ibm (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua, using Find-Best) + (9)(0)Loading: ibmA (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua, using Find-Best) + (10)(0)Loading: compiler-common/.ibm (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/Compiler/ibm/13 to MODULEPATH reloadAll(1)(mpi-common/.openmpi, openmpi, phdf5, compiler-common/.ibm, ibmA) - (11)Unloading: openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Compiler/gcc/7/openmpi/2.1.1.lua) + (11)(1)Unloading: openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Compiler/gcc/7/openmpi/2.1.1.lua) Removing: ProjectDIR/rt/family/mf/MPI/gcc/7/openmpi/2.1 from MODULEPATH - (12)Unloading: mpi-common/.openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua) + (12)(1)Unloading: mpi-common/.openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua) reloadAll(2)(phdf5, compiler-common/.ibm, ibmA) - (13)Unloading: phdf5 (status: active) (fn: ProjectDIR/rt/family/mf/MPI/gcc/7/openmpi/2.1/phdf5/1.8.18.lua) - (14)Loading: openmpi (fn: ProjectDIR/rt/family/mf/Compiler/ibm/13/openmpi/2.1.1.lua, using Find-Best) + (13)(2)Unloading: phdf5 (status: active) (fn: ProjectDIR/rt/family/mf/MPI/gcc/7/openmpi/2.1/phdf5/1.8.18.lua) + (14)(1)Loading: openmpi (fn: ProjectDIR/rt/family/mf/Compiler/ibm/13/openmpi/2.1.1.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1 to MODULEPATH - (15)Loading: mpi-common/.openmpi (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua, using Find-Best) + (15)(1)Loading: mpi-common/.openmpi (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua, using Find-Best) reloadAll(2)(compiler-common/.ibm, ibmA, mpi-common/.openmpi, openmpi, phdf5) - (16)Loading: phdf5 (fn: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1/phdf5/1.8.18.lua, using Find-Best) + (16)(2)Loading: phdf5 (fn: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1/phdf5/1.8.18.lua, using Find-Best) Due to MODULEPATH changes, the following have been reloaded: 1) openmpi/2.1.1 2) phdf5/1.8.18 The following have been reloaded with a version change: @@ -115,39 +115,39 @@ step 7 lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T load gccA mpich =========================== running: module --regression_testing -T load gccA mpich - (1)Loading: gccA (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua, using Find-Best) - (2)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) - (3)Unloading: compiler-common (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua) - (4)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) + (1)(0)Loading: gccA (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua, using Find-Best) + (2)(0)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) + (3)(0)Unloading: compiler-common (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.ibm.lua) + (4)(0)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/Compiler/gcc/7 to MODULEPATH Lmod is automatically replacing "ibmA/13.1.6" with "gccA/7.1.0". - (5)Unloading: ibmA (status: active) (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua) - (6)Unloading: compiler-common/.ibm (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua) + (5)(0)Unloading: ibmA (status: active) (fn: ProjectDIR/rt/family/mf/Core/ibmA/13.1.6.lua) + (6)(0)Unloading: compiler-common/.ibm (status: active) (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua) Removing: ProjectDIR/rt/family/mf/Compiler/ibm/13 from MODULEPATH - (7)Unloading: gccA (status: active) (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua) - (8)Unloading: compiler-common/.gcc (status: ) (fn: nil) + (7)(0)Unloading: gccA (status: active) (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua) + (8)(0)Unloading: compiler-common/.gcc (status: ) (fn: nil) Removing: ProjectDIR/rt/family/mf/Compiler/gcc/7 from MODULEPATH - (9)Loading: gccA (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua, using Find-Best) - (10)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) + (9)(0)Loading: gccA (fn: ProjectDIR/rt/family/mf/Core/gccA/7.1.0.lua, using Find-Best) + (10)(0)Loading: compiler-common/.gcc (fn: ProjectDIR/rt/family/mf/Core/compiler-common/.gcc.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/Compiler/gcc/7 to MODULEPATH - (11)Loading: mpich (fn: ProjectDIR/rt/family/mf/Compiler/gcc/7/mpich/3.2.1.lua, using Find-Best) + (11)(0)Loading: mpich (fn: ProjectDIR/rt/family/mf/Compiler/gcc/7/mpich/3.2.1.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/MPI/gcc/7/mpich/3.2 to MODULEPATH - (12)Loading: mpi-common/.mpich (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.mpich.lua, using Find-Best) - (13)Unloading: mpi-common (status: active) (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua) - (14)Loading: mpi-common/.mpich (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.mpich.lua, using Find-Best) + (12)(0)Loading: mpi-common/.mpich (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.mpich.lua, using Find-Best) + (13)(0)Unloading: mpi-common (status: active) (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.openmpi.lua) + (14)(0)Loading: mpi-common/.mpich (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.mpich.lua, using Find-Best) Lmod is automatically replacing "openmpi/2.1.1" with "mpich/3.2.1". - (15)Unloading: openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Compiler/ibm/13/openmpi/2.1.1.lua) + (15)(0)Unloading: openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Compiler/ibm/13/openmpi/2.1.1.lua) Removing: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1 from MODULEPATH - (16)Unloading: mpi-common/.openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.mpich.lua) - (17)Unloading: mpich (status: active) (fn: ProjectDIR/rt/family/mf/Compiler/gcc/7/mpich/3.2.1.lua) + (16)(0)Unloading: mpi-common/.openmpi (status: active) (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.mpich.lua) + (17)(0)Unloading: mpich (status: active) (fn: ProjectDIR/rt/family/mf/Compiler/gcc/7/mpich/3.2.1.lua) Removing: ProjectDIR/rt/family/mf/MPI/gcc/7/mpich/3.2 from MODULEPATH - (18)Unloading: mpi-common/.mpich (status: ) (fn: nil) - (19)Loading: mpich (fn: ProjectDIR/rt/family/mf/Compiler/gcc/7/mpich/3.2.1.lua, using Find-Best) + (18)(0)Unloading: mpi-common/.mpich (status: ) (fn: nil) + (19)(0)Loading: mpich (fn: ProjectDIR/rt/family/mf/Compiler/gcc/7/mpich/3.2.1.lua, using Find-Best) Appending: ProjectDIR/rt/family/mf/MPI/gcc/7/mpich/3.2 to MODULEPATH - (20)Loading: mpi-common/.mpich (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.mpich.lua, using Find-Best) + (20)(0)Loading: mpi-common/.mpich (fn: ProjectDIR/rt/family/mf/Core/mpi-common/.mpich.lua, using Find-Best) reloadAll(1)(phdf5, compiler-common/.gcc, gccA, mpi-common/.mpich, mpich) - (21)Unloading: phdf5 (status: active) (fn: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1/phdf5/1.8.18.lua) - (22)Loading: phdf5 (fn: ProjectDIR/rt/family/mf/MPI/gcc/7/mpich/3.2/phdf5/1.8.18.lua, using Find-Best) + (21)(1)Unloading: phdf5 (status: active) (fn: ProjectDIR/rt/family/mf/MPI/ibm/13/openmpi/2.1/phdf5/1.8.18.lua) + (22)(1)Loading: phdf5 (fn: ProjectDIR/rt/family/mf/MPI/gcc/7/mpich/3.2/phdf5/1.8.18.lua, using Find-Best) Due to MODULEPATH changes, the following have been reloaded: 1) phdf5/1.8.18 The following have been reloaded with a version change: diff --git a/rt/rstats/err.txt b/rt/rstats/err.txt index 49b06f32f..7bdf9be41 100644 --- a/rt/rstats/err.txt +++ b/rt/rstats/err.txt @@ -2,15 +2,15 @@ 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.15 2019-01-16 12:46 -06:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T load Rpkgs =========================== running: module --regression_testing -T load Rpkgs - (1)Loading: Rpkgs (fn: ProjectDIR/rt/rstats/mf/Core/Rpkgs/3.4.0.lua, using Find-Best) - (2)Loading: Rstats/3.4.0 (fn: ProjectDIR/rt/rstats/mf/Core/Rstats/3.4.0.lua, using Find-Best) + (1)(0)Loading: Rpkgs (fn: ProjectDIR/rt/rstats/mf/Core/Rpkgs/3.4.0.lua, using Find-Best) + (2)(0)Loading: Rstats/3.4.0 (fn: ProjectDIR/rt/rstats/mf/Core/Rstats/3.4.0.lua, using Find-Best) =========================== step 3 lua ProjectDIR/src/lmod.in.lua bash --regression_testing list @@ -22,4 +22,4 @@ step 4 lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T unload Rpkgs =========================== running: module --regression_testing -T unload Rpkgs - (1)Unloading: Rpkgs (status: active) (fn: ProjectDIR/rt/rstats/mf/Core/Rpkgs/3.4.0.lua) + (1)(0)Unloading: Rpkgs (status: active) (fn: ProjectDIR/rt/rstats/mf/Core/Rpkgs/3.4.0.lua) diff --git a/rt/spades/err.txt b/rt/spades/err.txt new file mode 100644 index 000000000..55ba490a3 --- /dev/null +++ b/rt/spades/err.txt @@ -0,0 +1,30 @@ +=========================== +step 1 +lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version +=========================== +Modules based on Lua: Version 7.8.15 2019-01-16 12:46 -06:00 + by Robert McLay mclay@tacc.utexas.edu +=========================== +step 2 +lua ProjectDIR/src/lmod.in.lua bash --regression_testing avail +=========================== +ProjectDIR/rt/spades/mf + spades/py27/3.13 spades/py36/3.13 spades/3.12 (D) + Where: + D: Default Module +Module defaults are chosen based on Find First Rules due to Name/Version/Version modules found in the module tree. +See https://lmod.readthedocs.io/en/latest/060_locating.html for details. +Use "module spider" to find all possible modules. +Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys". +=========================== +step 3 +lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider spades +=========================== + spades: + Versions: + spades/py27/3.13 + spades/py36/3.13 + spades/3.12 + For detailed information about a specific "spades" module (including how to load the modules) use the module's full name. + For example: + $ module spider spades/py36/3.13 diff --git a/rt/spades/mf/spades/.version b/rt/spades/mf/spades/.version new file mode 100644 index 000000000..e69de29bb diff --git a/rt/spades/mf/spades/3.12.lua b/rt/spades/mf/spades/3.12.lua new file mode 100644 index 000000000..6c9a87a51 --- /dev/null +++ b/rt/spades/mf/spades/3.12.lua @@ -0,0 +1,3 @@ +pushenv("CONDA_DEFAULT_ENV","spades-3.12.0") +prepend_path{"PATH","/util/opt/anaconda/deployed-conda-envs/packages/spades/envs/spades-3.12.0/bin",priority=100} +append_path("CONDA_ENVS_PATH", "/util/opt/anaconda/deployed-conda-envs/packages/spades/envs") diff --git a/rt/spades/mf/spades/py27/3.13.lua b/rt/spades/mf/spades/py27/3.13.lua new file mode 100644 index 000000000..dff30c414 --- /dev/null +++ b/rt/spades/mf/spades/py27/3.13.lua @@ -0,0 +1,3 @@ +pushenv("CONDA_DEFAULT_ENV","spades-3.13.0-py27") +prepend_path{"PATH","/util/opt/anaconda/deployed-conda-envs/packages/spades/envs/spades-3.13.0-py27/bin",priority=100} +append_path("CONDA_ENVS_PATH", "/util/opt/anaconda/deployed-conda-envs/packages/spades/envs") diff --git a/rt/spades/mf/spades/py36/3.13.lua b/rt/spades/mf/spades/py36/3.13.lua new file mode 100644 index 000000000..84f0c243d --- /dev/null +++ b/rt/spades/mf/spades/py36/3.13.lua @@ -0,0 +1,3 @@ +pushenv("CONDA_DEFAULT_ENV","spades-3.13.0-py36") +prepend_path{"PATH","/util/opt/anaconda/deployed-conda-envs/packages/spades/envs/spades-3.13.0-py36/bin",priority=100} +append_path("CONDA_ENVS_PATH", "/util/opt/anaconda/deployed-conda-envs/packages/spades/envs") diff --git a/rt/spades/out.txt b/rt/spades/out.txt new file mode 100644 index 000000000..cc0b7305f --- /dev/null +++ b/rt/spades/out.txt @@ -0,0 +1,22 @@ +=========================== +step 1 +lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version +=========================== +=========================== +step 2 +lua ProjectDIR/src/lmod.in.lua bash --regression_testing avail +=========================== +__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/spades/mf:1; +export __LMOD_REF_COUNT_MODULEPATH; +MODULEPATH=ProjectDIR/rt/spades/mf; +export MODULEPATH; +_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/spades/mf",},["systemBaseMPATH"]="ProjectDIR/rt/spades/mf",}'; +export _ModuleTable_; +=========================== +step 3 +lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider spades +=========================== +MODULEPATH=ProjectDIR/rt/spades/mf; +export MODULEPATH; +_ModuleTable_='_ModuleTable_={["MTversion"]=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/spades/mf",},["systemBaseMPATH"]="ProjectDIR/rt/spades/mf",}'; +export _ModuleTable_; diff --git a/rt/spades/spades.tdesc b/rt/spades/spades.tdesc new file mode 100644 index 000000000..441db9b5c --- /dev/null +++ b/rt/spades/spades.tdesc @@ -0,0 +1,58 @@ +-- -*- lua -*- +local testName = "spades" + +testdescript = { + owner = "rtm", + product = "modules", + description = [[ + nvv_prereq + ]], + keywords = {testName }, + + active = true, + testName = testName, + job_submit_method = "INTERACTIVE", + + runScript = [[ + + . $(projectDir)/rt/common_funcs.sh + + unsetMT + initStdEnvVars + export MODULEPATH=$(testDir)/mf + + rm -fr _stderr.* _stdout.* err.* out.* .lmod.d + + runLmod --version # 1 + + mkdir -p $HOME/.lmod.d/cache + buildSpiderT $MODULEPATH > $HOME/.lmod.d/cache/spiderT.lua + buildDbT $MODULEPATH > $HOME/.lmod.d/cache/dbT.lua + + runLmod avail # 2 + runLmod spider spades # 3 + + HOME=$ORIG_HOME + cat _stdout.[0-9][0-9][0-9] > _stdout.orig + joinBase64Results -bash _stdout.orig _stdout.new + cleanUp _stdout.new out.txt + + cat _stderr.[0-9][0-9][0-9] > _stderr.orig + cleanUp _stderr.orig err.txt + + rm -f results.csv + wrapperDiff --csv results.csv $(testDir)/out.txt out.txt + wrapperDiff --csv results.csv $(testDir)/err.txt err.txt + testFinish -r $(resultFn) -t $(runtimeFn) results.csv + ]], + + + blessScript = [[ + # perform what is needed + ]], + + tests = { + { id='t1'}, + }, + +} diff --git a/rt/use_w_sticky/err.txt b/rt/use_w_sticky/err.txt index 7bc18211c..20c1c2d5f 100644 --- a/rt/use_w_sticky/err.txt +++ b/rt/use_w_sticky/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.14 2019-01-14 13:30 -06:00 +Modules based on Lua: Version 7.8.15 2019-01-16 12:46 -06:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 @@ -31,7 +31,7 @@ running: module --regression_testing -T use ProjectDIR/rt/use_w_sticky/mf/Other Prepending: ProjectDIR/rt/use_w_sticky/mf/Other to MODULEPATH Prepending: ProjectDIR/rt/use_w_sticky/mf/A to MODULEPATH reloadAll(1)(HPCBIOS) - (1)Unloading: HPCBIOS (status: active) (fn: ProjectDIR/rt/use_w_sticky/mf/Core/HPCBIOS/2016q2.lua) + (1)(1)Unloading: HPCBIOS (status: active) (fn: ProjectDIR/rt/use_w_sticky/mf/Core/HPCBIOS/2016q2.lua) Removing: ProjectDIR/rt/use_w_sticky/mf/Other from MODULEPATH reloadAll(2)() Inactive Modules: diff --git a/src/Spider.lua b/src/Spider.lua index 8646b5b47..159e80de0 100644 --- a/src/Spider.lua +++ b/src/Spider.lua @@ -523,7 +523,8 @@ function M.buildDbT(self, mpathA, mpathMapT, spiderT, dbT) t.hidden = not mrc:isVisible({fullName=fullName, sn=sn, fn=vv.fn}) T[vv.fn] = t end - elseif (next(v.dirT) ~= nil) then + end + if (next(v.dirT) ~= nil) then for name, vv in pairs(v.dirT) do buildDbT_helper(mpath, sn, vv, T) end