Skip to content

Commit 86ec11c

Browse files
committed
Revert "modified the gentoo module to allow overwriting the location of the custom directory, to facilitate testing"
This reverts commit a228a29.
1 parent 1a60e4b commit 86ec11c

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

modules-avx/gentoo/2020.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ if not cuda_driver_version or cuda_driver_version == "" then
2020
cuda_driver_version = get_installed_cuda_driver_version()
2121
end
2222

23-
local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom"
24-
assert(loadfile(custom_root .. "/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version)
23+
assert(loadfile("/cvmfs/soft.computecanada.ca/custom/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version)

modules-avx2/gentoo/2020.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ if not cuda_driver_version or cuda_driver_version == "" then
2020
cuda_driver_version = get_installed_cuda_driver_version()
2121
end
2222

23-
local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom"
24-
assert(loadfile(custom_root .. "/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version)
23+
assert(loadfile("/cvmfs/soft.computecanada.ca/custom/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version)

modules-avx512/gentoo/2020.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ if not cuda_driver_version or cuda_driver_version == "" then
2020
cuda_driver_version = get_installed_cuda_driver_version()
2121
end
2222

23-
local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom"
24-
assert(loadfile(custom_root .. "/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version)
23+
assert(loadfile("/cvmfs/soft.computecanada.ca/custom/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version)

modules-sse3/gentoo/2020.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ if not cuda_driver_version or cuda_driver_version == "" then
2020
cuda_driver_version = get_installed_cuda_driver_version()
2121
end
2222

23-
local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom"
24-
assert(loadfile(custom_root .. "/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version)
23+
assert(loadfile("/cvmfs/soft.computecanada.ca/custom/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version)

modules/gentoo/2020.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ if not cuda_driver_version or cuda_driver_version == "" then
2727
cuda_driver_version = get_installed_cuda_driver_version()
2828
end
2929

30-
local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom"
31-
assert(loadfile(custom_root .. "/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version)
30+
assert(loadfile("/cvmfs/soft.computecanada.ca/custom/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version)
3231
conflict("StdEnv/2016.4")
3332
conflict("StdEnv/2018.3")

0 commit comments

Comments
 (0)