Update enviornment variables

Author: Tanush Prathi

CMakeLists.txt

@@ -442,6 +442,7 @@ function(MFC_SETUP_TARGET)
 
     foreach (a_target ${IPO_TARGETS})
         set_target_properties(${a_target} PROPERTIES Fortran_PREPROCESS ON)
+        message(STATUS ${CMAKE_Fortran_COMPILER_ID})
 
         target_include_directories(${a_target} PRIVATE
             "${CMAKE_SOURCE_DIR}/src/common"
@@ -462,8 +463,8 @@ function(MFC_SETUP_TARGET)
         if (MFC_MPI AND ARGS_MPI)
             find_package(MPI COMPONENTS Fortran REQUIRED)
 
-            target_compile_definitions(${a_target} PRIVATE MFC_MPI)
-            target_link_libraries     (${a_target} PRIVATE MPI::MPI_Fortran)
+            target_compile_definitions(${a_target} PRIVATE $ENV{CRAY_MPICH_INC})
+            target_link_libraries     (${a_target} PRIVATE $ENV{CRAY_MPICH_LIB})
         endif()
 
         if (ARGS_SILO)
@@ -482,8 +483,8 @@ function(MFC_SETUP_TARGET)
                     find_package(CUDAToolkit REQUIRED)
                     target_link_libraries(${a_target} PRIVATE CUDA::cudart CUDA::cufft)
                 else()
-                    find_package(hipfort COMPONENTS hipfft CONFIG REQUIRED)
-                    target_link_libraries(${a_target} PRIVATE hipfort::hipfft)
+                    # find_package(hipfort COMPONENTS hipfft CONFIG REQUIRED)
+                    target_link_libraries(${a_target} PRIVATE $ENV{CRAY_HIPFORT_INC})
                 endif()
             else()
                 find_package(FFTW REQUIRED)
@@ -529,8 +530,8 @@ function(MFC_SETUP_TARGET)
                     target_compile_options(${a_target} PRIVATE -fopenmp)
                     target_link_options(${a_target} PRIVATE -fopenmp)
                 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
-                    target_compile_options(${a_target} PRIVATE -fopenmp --offload-arch=gfx90a)
-                    target_link_options(${a_target} PRIVATE -fopenmp --offload-arch=gfx90a)
+                    target_compile_options(${a_target} PRIVATE -fopenmp --offload-arch=gfx90a $ENV{CRAY_MPICH_INC})
+                    target_link_options(${a_target} PRIVATE -fopenmp --offload-arch=gfx90a $ENV{CRAY_MPICH_LIB})          
                 endif()
             endif()
 
@@ -596,7 +597,7 @@ function(MFC_SETUP_TARGET)
                         PRIVATE -DFRONTIER_UNIFIED)
                 endif()
 
-    		find_package(hipfort COMPONENTS hip CONFIG REQUIRED)
+    		        find_package(hipfort COMPONENTS hip CONFIG REQUIRED)
                 target_link_libraries(${a_target} PRIVATE hipfort::hip hipfort::hipfort-amdgcn flang_rt.hostdevice)
             endif()
         elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")

load_amd.sh

@@ -1,7 +1,32 @@
-module use /ccs/home/bcornille/afar-drops/modulefiles/Core/
-module load rocm-afar-drop mpich cray-python
-module load cmake
-#export OMPX_APU_MAPS=0
-#export HSA_XNACK=0
-#export LIBOMPTARGET_INFO=0
-#export AMD_LOG_LEVEL=1
+module load python cmake
+module load cpe/25.09
+module load PrgEnv-amd
+
+AFAR_UMS_BASEDIR="/sw/crusher/ums/compilers/afar"
+AFAR_UMS_LATEST=$(ls -d --color=never ${AFAR_UMS_BASEDIR}/*/ | tail -n1)
+export OLCF_AFAR_ROOT=${AFAR_UMS_BASEDIR}/"rocm-afar-8873-drop-22.2.0"
+
+export PATH=${OLCF_AFAR_ROOT}/lib/llvm/bin:${PATH}
+export LD_LIBRARY_PATH=${OLCF_AFAR_ROOT}/lib:${OLCF_AFAR_ROOT}/lib/llvm/lib:${LD_LIBRARY_PATH}
+
+export CRAY_MPICH_INC="-I${OLCF_AFAR_ROOT}/include/mpich3.4a2"
+export CRAY_HIPFORT_INC="-I${OLCF_AFAR_ROOT}/include/hipfort/amdgcn"
+export CRAY_HIP_INC="-I${OLCF_AFAR_ROOT}/include/hip"
+export CRAY_MPICH_LIB="-L${CRAY_MPICH_PREFIX}/lib \
+                        ${CRAY_PMI_POST_LINK_OPTS} \
+                        -lmpifort_amd -lmpi_amd -lmpi -lpmi -lpmi2"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CRAY_LD_LIBRARY_PATH}"
+export CMAKE_PREFIX_PATH="${OLCF_AFAR_ROOT}:${CMAKE_PREFIX_PATH}"
+export FC="${OLCF_AFAR_ROOT}/bin/amdflang"
+
+unset MPICH_GPU_SUPPORT_ENABLED
+
+# module use /ccs/home/bcornille/afar-drops/modulefiles/Core/
+# module load rocm-afar-drop mpich cray-python
+# module load cmake
+
+export OMPX_APU_MAPS=0
+export HSA_XNACK=0
+export LIBOMPTARGET_INFO=0
+export AMD_LOG_LEVEL=1
+export OFFLOAD_TRACK_ALLOCATION_TRACES=true