Skip to content

Commit f066790

Browse files
authored
Merge pull request #34 from ComputeCanada/mii_index_cpu_vendor_id
changing gentoo and nixpkgs modules to use the mii index based on cpu…
2 parents 040101d + f96044c commit f066790

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

modules/gentoo/2020.lua.core

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ elseif arch == "avx" then
6060
else
6161
setenv("PIP_CONFIG_FILE", "/cvmfs/soft.computecanada.ca/config/python/pip-gentoo.conf")
6262
end
63-
setenv("MII_INDEX_FILE", "/cvmfs/soft.computecanada.ca/custom/mii/data/" .. arch)
63+
setenv("MII_INDEX_FILE", "/cvmfs/soft.computecanada.ca/custom/mii/data/" .. arch .. "_" .. vendor_id)
6464

6565
-- also make easybuild and easybuild-generated modules accessible
6666
prepend_path("PATH", "/cvmfs/soft.computecanada.ca/easybuild/bin")

modules/nixpkgs/16.09.lua.core

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ elseif arch == "avx" then
6969
else
7070
setenv("PIP_CONFIG_FILE", "/cvmfs/soft.computecanada.ca/config/python/pip.conf")
7171
end
72-
setenv("MII_INDEX_FILE", "/cvmfs/soft.computecanada.ca/custom/mii/data/" .. arch)
72+
setenv("MII_INDEX_FILE", "/cvmfs/soft.computecanada.ca/custom/mii/data/" .. arch .. "_" .. cpu_vendor_id)
7373

7474
-- also make easybuild and easybuild-generated modules accessible
7575
prepend_path("PATH", "/cvmfs/soft.computecanada.ca/easybuild/bin")

0 commit comments

Comments
 (0)