Merge pull request #334 from PDoakORNL/fix_ctaux_build

Fix ctaux build Fix libfabric build on frontier
CompFUSE · Nov 8, 2024 · c9f9a39 · c9f9a39
2 parents 60bb2f9 + b3c22f6
commit c9f9a39
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/build-aux/frontier_rocm6_load_modules.sh b/build-aux/frontier_rocm6_load_modules.sh
@@ -12,17 +12,10 @@ module load amd-mixed/6.0.0
 module load libfabric/1.15.2.0
 module load ninja
 module load cmake
-module load hdf5
-#spack load cmake%[email protected]
-#spack load ninja%[email protected]
-#spack load magma@master amdgpu_target=gfx90a
-#spack load [email protected] +cxx ~mpi api=v112 %[email protected]
-#spack load fftw ~mpi %[email protected]
-#spack load [email protected] %[email protected]
 
 export CC=mpicc
 export CXX=mpicxx
-
+export HDF5_ROOT=/lustre/orion/cph102/proj-shared/epd/spack/opt/spack/linux-sles15-zen3/rocmcc-6.0.0/hdf5-1.12.1-ajskwiaabdvgc36ozb6hzqnrwu2becha
 export OPENBLAS_ROOT=/lustre/orion/cph102/proj-shared/epd/spack/opt/spack/linux-sles15-zen3/gcc-11.2.0/openblas-0.3.25-scaywvuh5zsm5u7smg54plj2oyf7nekv
 export MAGMA_ROOT=/lustre/orion/cph102/proj-shared/epd/spack/opt/spack/linux-sles15-zen3/rocmcc-6.0.0/magma-master-rizw3ajkhfcq5cjutoykgkkv5hexftoz
 export FFTW_PATH=/lustre/orion/cph102/proj-shared/epd/spack/opt/spack/linux-sles15-zen3/rocmcc-6.0.0/fftw-3.3.10-2mykijticsr5rfbyunax4zrwhhzcb7qm

diff --git a/include/dca/phys/dca_step/cluster_solver/ctaux/ctaux_cluster_solver.hpp b/include/dca/phys/dca_step/cluster_solver/ctaux/ctaux_cluster_solver.hpp
@@ -163,7 +163,7 @@ class CtauxClusterSolver {
 
   G0Interpolation<device, Scalar> g0_;
 
-  Walker::Resource walker_dummy_resource_;
+  Walker::Resource dummy_walker_resource_;
 private:
   Rng rng_;
 

diff --git a/include/dca/phys/dca_step/cluster_solver/ctaux/ctaux_walker.hpp b/include/dca/phys/dca_step/cluster_solver/ctaux/ctaux_walker.hpp
@@ -73,7 +73,7 @@ class CtauxWalker : public WalkerBIT<Parameters, Data>, public CtauxWalkerData<d
   /** constructor
    *  param[in] id    thread id
    */
-  CtauxWalker(Parameters& parameters_ref, Data& MOMS_ref, Rng& rng_ref, int id);
+  CtauxWalker(Parameters& parameters_ref, Data& MOMS_ref, Rng& rng_ref, Resource& resource, int id);
 
   void initialize(int iteration);
 
@@ -388,7 +388,7 @@ class CtauxWalker : public WalkerBIT<Parameters, Data>, public CtauxWalkerData<d
 
 template <dca::linalg::DeviceType device_t, class Parameters, class Data>
 CtauxWalker<device_t, Parameters, Data>::CtauxWalker(Parameters& parameters_ref, Data& MOMS_ref,
-                                                     Rng& rng_ref, int id)
+                                                     Rng& rng_ref, Resource& resource, int id)
     : WalkerBIT<Parameters, Data>(parameters_ref, MOMS_ref, id),
       CtauxWalkerData<device_t, Parameters>(parameters_ref, id),
       parameters_(parameters_ref),

diff --git a/test/unit/phys/dca_step/cluster_solver/ctaux/walker/ct_aux_walker_test.cpp b/test/unit/phys/dca_step/cluster_solver/ctaux/walker/ct_aux_walker_test.cpp
@@ -117,7 +117,8 @@ TEST_F(CtauxWalkerTest, InsertAndRemoveVertex) {
           walker.get_configuration().get_number_of_interacting_HS_spins());
   };
 
-  CPUWalker cpu_walker(cpu_parameters, cpu_data, cpu_rng, 0);
+  CPUWalker::Resource resource;
+  CPUWalker cpu_walker(cpu_parameters, cpu_data, cpu_rng, resource, 0);
 
   cpu_walker.initialize(0);
   // for (int i = 0; i < 1; i++) {
@@ -130,7 +131,8 @@ TEST_F(CtauxWalkerTest, InsertAndRemoveVertex) {
   int cpu_steps = 1;
   stepBeforeComputeGamma(cpu_walker, cpu_steps);
 
-  GPUWalker gpu_walker(gpu_parameters, gpu_data, gpu_rng, 0);
+  GPUWalker::Resource gpu_resource;
+  GPUWalker gpu_walker(gpu_parameters, gpu_data, gpu_rng, gpu_resource, 0);
   gpu_walker.initialize(0);
 
   // for (int i = 0; i < 1; i++) {

diff --git a/test/unit/phys/dca_step/cluster_solver/ctaux/walker/walker_wrapper.hpp b/test/unit/phys/dca_step/cluster_solver/ctaux/walker/walker_wrapper.hpp
@@ -35,8 +35,8 @@ class CTAUXWalkerWrapper : public CtauxWalker<DEVICE, Parameters, dca::phys::Dca
   using Rng = typename Base::Rng;
 
   CTAUXWalkerWrapper(Parameters& parameters_ref, dca::phys::DcaData<Parameters>& data, Rng& rng_ref,
-                     int id [[maybe_unused]])
-      : Base(parameters_ref, data, rng_ref, 0) {
+                     Base::Resource& resource, int id [[maybe_unused]])
+    : Base(parameters_ref, data, rng_ref, resource, 0) {
     Base::initialize(0);
   }