From d230475f86f67e16d109f8e21733c19f7b553657 Mon Sep 17 00:00:00 2001
From: "Thomas D. Kuehne" <tkuehne@cp2k.org>
Date: Sat, 6 Jun 2026 14:54:16 +0200
Subject: [PATCH] Fix CUTLASS local work driver setup

---
 cmake/gauxc-exchcxx.cmake                       |  8 +++++---
 cmake/gauxc-integratorxx.cmake                  |  8 +++++---
 src/xc_integrator/local_work_driver/factory.cxx | 15 ++++++++++++++-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/cmake/gauxc-exchcxx.cmake b/cmake/gauxc-exchcxx.cmake
index 412df9b30..011ae844a 100644
--- a/cmake/gauxc-exchcxx.cmake
+++ b/cmake/gauxc-exchcxx.cmake
@@ -1,5 +1,5 @@
 find_package( ExchCXX QUIET )
-if( NOT ${ExchCXX_FOUND} )
+if( NOT ExchCXX_FOUND )
 
   include( gauxc-dep-versions )
 
@@ -19,6 +19,10 @@ if( NOT ${ExchCXX_FOUND} )
 
   FetchContent_MakeAvailable( exchcxx )
 
+  if( CMAKE_POSITION_INDEPENDENT_CODE AND TARGET exchcxx )
+    set_target_properties( exchcxx PROPERTIES POSITION_INDEPENDENT_CODE ON )
+  endif()
+
 
 else()
 
@@ -31,5 +35,3 @@ else()
   endif()
 
 endif()
-
-
diff --git a/cmake/gauxc-integratorxx.cmake b/cmake/gauxc-integratorxx.cmake
index b6bbbf0e7..502067d23 100644
--- a/cmake/gauxc-integratorxx.cmake
+++ b/cmake/gauxc-integratorxx.cmake
@@ -1,5 +1,5 @@
 find_package( IntegratorXX QUIET )
-if( NOT ${IntegratorXX_FOUND} )
+if( NOT IntegratorXX_FOUND )
 
   include( gauxc-dep-versions )
 
@@ -16,6 +16,8 @@ if( NOT ${IntegratorXX_FOUND} )
 
   FetchContent_MakeAvailable( integratorxx )
 
-endif()
-
+  if( CMAKE_POSITION_INDEPENDENT_CODE AND TARGET integratorxx )
+    set_target_properties( integratorxx PROPERTIES POSITION_INDEPENDENT_CODE ON )
+  endif()
 
+endif()
diff --git a/src/xc_integrator/local_work_driver/factory.cxx b/src/xc_integrator/local_work_driver/factory.cxx
index fd6b86ad4..3547e1d31 100644
--- a/src/xc_integrator/local_work_driver/factory.cxx
+++ b/src/xc_integrator/local_work_driver/factory.cxx
@@ -11,18 +11,31 @@
  */
 #include <gauxc/xc_integrator/local_work_driver.hpp>
 #include "host/reference_local_host_work_driver.hpp"
+#include <algorithm>
+#include <cctype>
 #ifdef GAUXC_HAS_DEVICE
 #include "device/cuda/cuda_aos_scheme1.hpp"
 #include "device/hip/hip_aos_scheme1.hpp"
 #endif
 
 namespace GauXC {
+namespace {
+
+void trim_and_uppercase(std::string& name) {
+  auto not_space = [](unsigned char c) { return !std::isspace(c); };
+  name.erase(name.begin(), std::find_if(name.begin(), name.end(), not_space));
+  name.erase(std::find_if(name.rbegin(), name.rend(), not_space).base(), name.end());
+  std::transform(name.begin(), name.end(), name.begin(),
+                 [](unsigned char c) { return static_cast<char>(std::toupper(c)); });
+}
+
+}
 
 LocalWorkDriverFactory::ptr_return_t
   LocalWorkDriverFactory::make_local_work_driver( ExecutionSpace ex, 
     std::string name, LocalWorkSettings settings ) {
 
-  std::transform( name.begin(), name.end(), name.begin(), ::toupper );
+  trim_and_uppercase(name);
   (void)(settings);
 
   switch(ex) {