diff --git a/modules-avx/gentoo/2020.lua b/modules-avx/gentoo/2020.lua index c33855a..f88828c 100644 --- a/modules-avx/gentoo/2020.lua +++ b/modules-avx/gentoo/2020.lua @@ -20,4 +20,5 @@ if not cuda_driver_version or cuda_driver_version == "" then cuda_driver_version = get_installed_cuda_driver_version() end -assert(loadfile("/cvmfs/soft.computecanada.ca/custom/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version) +local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom" +assert(loadfile(custom_root .. "/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version) diff --git a/modules-avx2/gentoo/2020.lua b/modules-avx2/gentoo/2020.lua index 3cfe6d9..4ab92fd 100644 --- a/modules-avx2/gentoo/2020.lua +++ b/modules-avx2/gentoo/2020.lua @@ -20,4 +20,5 @@ if not cuda_driver_version or cuda_driver_version == "" then cuda_driver_version = get_installed_cuda_driver_version() end -assert(loadfile("/cvmfs/soft.computecanada.ca/custom/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version) +local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom" +assert(loadfile(custom_root .. "/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version) diff --git a/modules-avx512/gentoo/2020.lua b/modules-avx512/gentoo/2020.lua index c56accb..ef16f1c 100644 --- a/modules-avx512/gentoo/2020.lua +++ b/modules-avx512/gentoo/2020.lua @@ -20,4 +20,5 @@ if not cuda_driver_version or cuda_driver_version == "" then cuda_driver_version = get_installed_cuda_driver_version() end -assert(loadfile("/cvmfs/soft.computecanada.ca/custom/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version) +local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom" +assert(loadfile(custom_root .. "/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version) diff --git a/modules-sse3/gentoo/2020.lua b/modules-sse3/gentoo/2020.lua index 3e60913..385d195 100644 --- a/modules-sse3/gentoo/2020.lua +++ b/modules-sse3/gentoo/2020.lua @@ -20,4 +20,5 @@ if not cuda_driver_version or cuda_driver_version == "" then cuda_driver_version = get_installed_cuda_driver_version() end -assert(loadfile("/cvmfs/soft.computecanada.ca/custom/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version) +local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom" +assert(loadfile(custom_root .. "/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version) diff --git a/modules/arch/avx.lua b/modules/arch/avx.lua index f4cdd28..19c9ecb 100644 --- a/modules/arch/avx.lua +++ b/modules/arch/avx.lua @@ -1,4 +1,5 @@ if (mode() ~= "spider") then - prepend_path("MODULEPATH","/cvmfs/soft.computecanada.ca/custom/modules-avx") + local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom" + prepend_path("MODULEPATH", custom_root .. "/modules-avx") setenv("EBVERSIONARCH","avx") end diff --git a/modules/arch/avx2.lua b/modules/arch/avx2.lua index 6e9c721..52d6a4e 100644 --- a/modules/arch/avx2.lua +++ b/modules/arch/avx2.lua @@ -1,4 +1,5 @@ if (mode() ~= "spider") then - prepend_path("MODULEPATH","/cvmfs/soft.computecanada.ca/custom/modules-avx2") + local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom" + prepend_path("MODULEPATH", custom_root .. "/modules-avx2") setenv("EBVERSIONARCH","avx2") end diff --git a/modules/arch/avx512.lua b/modules/arch/avx512.lua index 5566cd8..4ba0991 100644 --- a/modules/arch/avx512.lua +++ b/modules/arch/avx512.lua @@ -1,4 +1,5 @@ if (mode() ~= "spider") then - prepend_path("MODULEPATH","/cvmfs/soft.computecanada.ca/custom/modules-avx512") + local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom" + prepend_path("MODULEPATH", custom_root .. "/modules-avx512") setenv("EBVERSIONARCH","avx512") end diff --git a/modules/arch/sse3.lua b/modules/arch/sse3.lua index cd852ca..ffa1d10 100644 --- a/modules/arch/sse3.lua +++ b/modules/arch/sse3.lua @@ -1,4 +1,5 @@ if (mode() ~= "spider") then - prepend_path("MODULEPATH","/cvmfs/soft.computecanada.ca/custom/modules-sse3") + local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom" + prepend_path("MODULEPATH", custom_root .. "/modules-sse3") setenv("EBVERSIONARCH","sse3") end diff --git a/modules/gentoo/2020.lua b/modules/gentoo/2020.lua index 7e053aa..c085228 100644 --- a/modules/gentoo/2020.lua +++ b/modules/gentoo/2020.lua @@ -27,6 +27,7 @@ if not cuda_driver_version or cuda_driver_version == "" then cuda_driver_version = get_installed_cuda_driver_version() end -assert(loadfile("/cvmfs/soft.computecanada.ca/custom/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version) +local custom_root = os.getenv("RSNT_CUSTOM_ROOT") or "/cvmfs/soft.computecanada.ca/custom" +assert(loadfile(custom_root .. "/modules/gentoo/2020.lua.core"))(arch, cpu_vendor_id, interconnect, cuda_driver_version) conflict("StdEnv/2016.4") conflict("StdEnv/2018.3")