From 733a8401a4b6d6029b0bb632b052f470845a1e3f Mon Sep 17 00:00:00 2001
From: Bart Oldeman <bart.oldeman@calculquebec.ca>
Date: Fri, 1 Aug 2025 19:05:17 +0000
Subject: [PATCH] StdEnv/2023: FLEXIBLAS64 and RSNT_LOAD_DEFAULT_TOOLCHAIN

Sites can set RSNT_LOAD_DEFAULT_TOOLCHAIN=no to avoid loading
a compiler, MPI, and linear algebra module by default.

Also set FLEXIBLAS64 to use the correct backend for libflexiblas64:
we need FLEXIBLAS set even without the flexiblas module loaded
because of RPATH'ed module binaries and Python wheels.
---
 modules/StdEnv/2023.lua | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/modules/StdEnv/2023.lua b/modules/StdEnv/2023.lua
index d968aa7..4a94e70 100644
--- a/modules/StdEnv/2023.lua
+++ b/modules/StdEnv/2023.lua
@@ -26,19 +26,30 @@ if (mode() == "spider" and (arch == "avx2" or arch == "avx512")) then
 	end
 end
 
-load("gcc")
-load("openmpi")
-load("flexiblas")
 local cpu_vendor_id = os.getenv("RSNT_CPU_VENDOR_ID")
 if cpu_vendor_id == "amd" then
 	if (arch == "avx512") then
-		load("aocl-blas")
-		load("aocl-lapack")
 		setenv("FLEXIBLAS", "aocl")
+		setenv("FLEXIBLAS64", "aocl")
 	else
-		load("blis")
 		setenv("FLEXIBLAS", "blis")
+		setenv("FLEXIBLAS64", "blis")
+	end
+end
+
+local load_default_toolchain = os.getenv("RSNT_LOAD_DEFAULT_TOOLCHAIN") or "yes"
+if load_default_toolchain == "yes" then
+	load("gcc")
+	load("openmpi")
+	load("flexiblas")
+	if cpu_vendor_id == "amd" then
+		if (arch == "avx512") then
+			load("aocl-blas")
+			load("aocl-lapack")
+		else
+			load("blis")
+		end
+	else
+		load("imkl")
 	end
-else
-	load("imkl")
 end