Skip to content

Commit

Permalink
new cc test over default selection
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McLay committed Jan 8, 2019
1 parent d7914c3 commit 5cb193b
Show file tree
Hide file tree
Showing 68 changed files with 320 additions and 503 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
25 changes: 25 additions & 0 deletions rt/cc/MF/Core/intel/2016.4.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
help([==[
Description
===========
Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and fortran compilers, Intel MPI and Intel MKL
More information
================
- Homepage: http://software.intel.com/en-us/intel-cluster-toolkit-compiler/
]==])

whatis([==[Description: Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and fortran compilers, Intel MPI and Intel MKL]==])
whatis([==[Homepage: http://software.intel.com/en-us/intel-cluster-toolkit-compiler/]==])

local root = "/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/intel/2016.4"

setenv("EBROOTICCIFORT", root)
setenv("EBVERSIONICCIFORT", "2016.4")
setenv("EBDEVELICCIFORT", pathJoin(root, "easybuild/Core-intel-2016.4-easybuild-devel"))

--add_property("type_","tools")
family("compiler")

-- Built with EasyBuild version 3.5.0-r9c88db64dba51c4ffd22799c06090d57aaf17e38
26 changes: 26 additions & 0 deletions rt/cc/MF/Core/intel/2018.3.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
help([==[
Description
===========
Intel C, C++ & Fortran compilers
More information
================
- Homepage: http://software.intel.com/en-us/intel-cluster-toolkit-compiler/
]==])

whatis([==[Description: Intel C, C++ & Fortran compilers]==])
whatis([==[Homepage: http://software.intel.com/en-us/intel-cluster-toolkit-compiler/]==])

local root = "/cvmfs/soft.computecanada.ca/easybuild/software/2017/Core/intel/2018.3"


setenv("EBROOTICCIFORT", root)
setenv("EBVERSIONICCIFORT", "2018.3")
setenv("EBDEVELICCIFORT", pathJoin(root, "easybuild/Core-intel-2018.3-easybuild-devel"))

--add_property("type_","tools")
family("compiler")

-- Built with EasyBuild version 3.7.0-rc7b39e420d4f1af2b79028319dfd5ed90b504390
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions rt/cc/MF/modules/StdEnv/2016.4.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
--add_property( "lmod", "sticky")
local mroot=os.getenv("MODULEPATH_ROOT")
prepend_path("MODULEPATH", pathJoin(mroot,"Core"))
load("intel/2016.4")
--load("openmpi/2.1.1")
5 changes: 5 additions & 0 deletions rt/cc/MF/modules/StdEnv/2018.3.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
--add_property( "lmod", "sticky")
local mroot=os.getenv("MODULEPATH_ROOT")
prepend_path("MODULEPATH", pathJoin(mroot,"Core"))

load("intel/2018.3")
File renamed without changes.
File renamed without changes.
16 changes: 10 additions & 6 deletions rt/over_sticky/over_sticky.tdesc → rt/cc/cc.tdesc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
-- -*- lua -*-
local testName = "over_sticky"
local testName = "cc"

testdescript = {
owner = "rtm",
product = "modules",
description = [[
testing over_sticky problems
testing cc defaults problems
]],
keywords = {testName },

Expand All @@ -19,12 +19,11 @@ testdescript = {
unsetMT
initStdEnvVars
export MODULEPATH_ROOT=$(testDir)/mf
export MODULEPATH_ROOT=$(testDir)/MF
export MODULEPATH=$MODULEPATH_ROOT/modules
export CC_CLUSTER="computecanada"
export RSNT_INTERCONNECT="infiniband"
export RSNT_ARCH="avx512"
export MODULERCFILE=$(testDir)/modulerc
rm -fr _stderr.* _stdout.* err.* out.* .lmod.d
Expand All @@ -35,8 +34,13 @@ testdescript = {
runLmod list # 4
runLmod load arch/avx512 # 5
runLmod list # 6
runLmod load StdEnv # 7
runLmod list # 8
runLmod purge # 7
runLmod load StdEnv # 8
runLmod list # 9
runLmod load arch/avx512 #10
runLmod list #11
runLmod load StdEnv #12
runLmod list #13
HOME=$ORIG_HOME
cat _stdout.[0-9][0-9][0-9] > _stdout.orig
Expand Down
62 changes: 31 additions & 31 deletions rt/over_sticky/err.txt → rt/cc/err.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@ Modules based on Lua: Version 7.8.11 2018-11-28 14:08 -06:00
step 2
lua ProjectDIR/src/lmod.in.lua bash --regression_testing avail
===========================
Global Aliases
allinea-cpu -> ddt-cpu arm-forge-cpu -> ddt-cpu
allinea-gpu -> ddt-gpu arm-forge-gpu -> ddt-gpu
ProjectDIR/rt/over_sticky/mf/modules
StdEnv/2016.4 (D) arch/avx2 nixpkgs/16.09
StdEnv/2018.3 arch/avx512 (D)
ProjectDIR/rt/cc/MF/modules
StdEnv/2016.4 (D) StdEnv/2018.3 arch/avx2 arch/avx512 (D)
Where:
D: Default Module
Use "module spider" to find all possible modules.
Expand All @@ -27,46 +23,50 @@ step 4
lua ProjectDIR/src/lmod.in.lua bash --regression_testing list
===========================
Currently Loaded Modules:
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
1) intel/2016.4 2) StdEnv/2016.4
===========================
step 5
lua ProjectDIR/src/lmod.in.lua bash --regression_testing load arch/avx512
===========================
Due to MODULEPATH changes, the following have been reloaded:
1) gcccore/.5.4.0 3) ifort/.2016.4.258 5) intel/2016.4
2) icc/.2016.4.258 4) imkl/11.3.4.258 6) nixpkgs/16.09
===========================
step 6
lua ProjectDIR/src/lmod.in.lua bash --regression_testing list
===========================
Currently Loaded Modules:
1) StdEnv/2016.4 4) gcccore/.5.4.0 (H) 7) imkl/11.3.4.258
2) arch/avx512 5) icc/.2016.4.258 (H) 8) intel/2016.4
3) nixpkgs/16.09 6) ifort/.2016.4.258 (H)
Where:
H: Hidden Module
1) intel/2016.4 2) StdEnv/2016.4 3) arch/avx512
===========================
step 7
lua ProjectDIR/src/lmod.in.lua bash --regression_testing purge
===========================
===========================
step 8
lua ProjectDIR/src/lmod.in.lua bash --regression_testing load StdEnv
===========================
===========================
step 9
lua ProjectDIR/src/lmod.in.lua bash --regression_testing list
===========================
Currently Loaded Modules:
1) intel/2016.4 2) StdEnv/2016.4
===========================
step 10
lua ProjectDIR/src/lmod.in.lua bash --regression_testing load arch/avx512
===========================
The following have been reloaded with a version change:
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
1) StdEnv/2016.4 => StdEnv/2018.3 2) intel/2016.4 => intel/2018.3
===========================
step 8
step 11
lua ProjectDIR/src/lmod.in.lua bash --regression_testing list
===========================
Currently Loaded Modules:
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
1) arch/avx512 2) intel/2018.3 3) StdEnv/2018.3
===========================
step 12
lua ProjectDIR/src/lmod.in.lua bash --regression_testing load StdEnv
===========================
===========================
step 13
lua ProjectDIR/src/lmod.in.lua bash --regression_testing list
===========================
Currently Loaded Modules:
1) arch/avx512 2) intel/2018.3 3) StdEnv/2018.3
1 change: 1 addition & 0 deletions rt/cc/mf/Core-avx2
1 change: 1 addition & 0 deletions rt/cc/mf/Core-avx512
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions rt/cc/mf/Core/intel/.modulerc.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if (os.getenv("RSNT_ARCH") == "avx512") then
module_version("intel/2018.3","default")
else
module_version("intel/2016.4","default")
end
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions rt/cc/mf/modules-avx2/StdEnv/2016.4.lua
1 change: 1 addition & 0 deletions rt/cc/mf/modules-avx2/StdEnv/2018.3.lua
File renamed without changes.
1 change: 1 addition & 0 deletions rt/cc/mf/modules-avx512/StdEnv/.modulerc.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module_version("StdEnv/2018.3", "default")
1 change: 1 addition & 0 deletions rt/cc/mf/modules-avx512/StdEnv/2016.4.lua
1 change: 1 addition & 0 deletions rt/cc/mf/modules-avx512/StdEnv/2018.3.lua
File renamed without changes.
1 change: 1 addition & 0 deletions rt/cc/mf/modules/StdEnv/.modulerc.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module_version("StdEnv/2016.4", "default")
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions rt/cc/mf/modules/arch/avx2.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
if (mode() ~= "spider") then
local mroot = os.getenv("MODULEPATH_ROOT")
prepend_path("MODULEPATH", pathJoin(mroot, "modules-avx2"))
end
4 changes: 4 additions & 0 deletions rt/cc/mf/modules/arch/avx512.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
if (mode() ~= "spider") then
local mroot = os.getenv("MODULEPATH_ROOT")
prepend_path("MODULEPATH", pathJoin(mroot, "modules-avx512"))
end
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 5cb193b

Please sign in to comment.