remove jemalloc

FSL-install-config/config/buildSettings.mk

@@ -56,10 +56,10 @@ ARCHCXXFLAGS = -std=c++17 -fPIC -g -O0
 ARCHCPPFLAGS = -g -O0
 
 # Linker flags for all projects
-ARCHLDFLAGS = -L /usr/local/lib/python3.10/dist-packages/ray/core -ljemalloc
+ARCHLDFLAGS = 
 
 # Libraries available for linking by all projects.
-ARCHLIBS = -L /usr/local/lib/python3.10/dist-packages/ray/core -ljemalloc
+ARCHLIBS = 
 
 # Compiler flags for CUDA projects.
 #  - Define ARMA_ALLOW_FAKE_GCC, otherwise nvcc-compiled
@@ -73,7 +73,7 @@ ARCHLIBS = -L /usr/local/lib/python3.10/dist-packages/ray/core -ljemalloc
 ARCHNVCCFLAGS = -DARMA_ALLOW_FAKE_GCC -std=c++17 -fPIC -g -O0
 
 # Linker flags for CUDA projects.
-ARCHNVCCLDFLAGS = -std=c++17 -fPIC  -L /usr/local/lib/python3.10/dist-packages/ray/core -ljemalloc
+ARCHNVCCLDFLAGS = -std=c++17 -fPIC  
 
 #####################################################################
 #

Makefile

@@ -84,13 +84,12 @@ endif
 # Understood by both clang++ and g++
 USRLDFLAGS   = -rdynamic
 USRNVCCFLAGS = -DCOMPILE_GPU -Icuda
-CUDALIBS     = -L /datav/wkx/fsl/FSL-install-new/lib -lfsl-cudabasisfield_cuda11.8 \
-  -lhipblas -L/datav/wkx/fsl/FSL-install-new/lib -L/datav/wkx/fsl/FSL-install-new/lib \
+CUDALIBS     = -L /workspace/FSL-install/lib -lfsl-cudabasisfield_cuda11.8 \
+  -lhipblas -L/workspace/FSL-install/lib -L/workspace/FSL-install/lib \
   -lfsl-topup -lfsl-warpfns -lfsl-meshclass -lfsl-basisfield -lfsl-newimage \
   -lfsl-miscmaths -lfsl-cprob -lfsl-NewNifti -lfsl-znz -lfsl-utils  \
-  -L /usr/local/lib/python3.10/dist-packages/ray/core -ljemalloc \
   -llapack -lblas -lz -lm -fvisibility=default -fPIC 
-LIBS         = -L /datav/wkx/fsl/FSL-install-new/lib -lfsl-topup -lfsl-warpfns -lfsl-meshclass -lfsl-basisfield \
+LIBS         = -L /workspace/FSL-install/lib -lfsl-topup -lfsl-warpfns -lfsl-meshclass -lfsl-basisfield \
                -lfsl-newimage -lfsl-miscmaths -lfsl-cprob -lfsl-NewNifti \
                -lfsl-znz -lfsl-utils 
 
@@ -144,7 +143,7 @@ clean:
 
 HIPCXXFLAGS = -DARMA_ALLOW_FAKE_GCC -std=c++17 -fPIC -g -O0 \
  -I /opt/dtk/include -I  ${FSLCONFDIR}/../include  -I .
-HIPLDFLAGS = -L /opt/dtk/lib -l hipblas -l hipblaslt -l galaxyhip -l amdhip64 -DARMA_ALLOW_FAKE_GCC -std=c++17 -fPIC -g -O0
+HIPLDFLAGS = -L /opt/dtk/lib -l hipblas -l hipblaslt -l galaxyhip -l amdhip64 -DARMA_ALLOW_FAKE_GCC -std=c++17 -fPIC -g -O0 
 
 # -DARMA_ALLOW_FAKE_GCC -std=c++17 -fPIC -g -O0
 #################################
@@ -172,7 +171,7 @@ eddy_cuda${CUDA_VER}: ${CUDAOBJS}
 
 cudabuild/cuda${CUDA_VER}/%.o: cuda/%.cpp
 	@mkdir -p cudabuild/cuda${CUDA_VER}
-	hipcc $(NVCCFLAGS) -c -o $@ $< -g -O0 -fvisibility=default -fPIC
+	hipcc $(NVCCFLAGS) -c -o $@ $< -g -O0 -fvisibility=default -fPIC --gpu-max-threads-per-block=1024
 
 cudabuild/%.o: %.cpp
 	@mkdir -p cudabuild

compile.sh

+export FSLCONFDIR=/workspace/FSL-install/config
+export FSLDIR=/workspace/FSL-install
+export FSLDEVDIR=/workspace/FSL-install
+export LD_LIBRARY_PATH=/workspace/FSL-install/lib:$LD_LIBRARY_PATH
+
+cp -rf /workspace/fsl-eddy/FSL-install-config/config/* /workspace/FSL-install/config
+
 make clean && make cpu=1 cuda=1 -j$(nproc) 2>&1 | tee log.log
\ No newline at end of file