Skip to content
This repository has been archived by the owner on Dec 9, 2024. It is now read-only.

Fix ROCm compilation #390

Merged
merged 3 commits into from
Apr 18, 2024
Merged

Fix ROCm compilation #390

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ab4878
Fixed rocm compilation
ariostas Apr 16, 2024
95d8982
Check if sdl_rocm was built
ariostas Apr 16, 2024
fdb3fc1
Clean up makefile
ariostas Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ ROOTCFLAGS = $(foreach option, $(shell root-config --cflags), $(option))
ALPAKAINCLUDE = -I${ALPAKA_ROOT}/include -I/${BOOST_ROOT}/include -std=c++17 -DALPAKA_DEBUG=0
ALPAKA_CPU = -DALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLED
ALPAKA_CUDA = -DALPAKA_ACC_GPU_CUDA_ENABLED -DALPAKA_HOST_ONLY
ALPAKA_ROCM = -DALPAKA_ACC_GPU_HIP_ENABLED -DALPAKA_HOST_ONLY -DALPAKA_DISABLE_VENDOR_RNG
CFLAGS = $(ROOTCFLAGS) -Wall -Wno-unused-function -g -O2 -fPIC -fno-var-tracking -ISDL -I$(shell pwd) -Icode -Icode/core -I${CUDA_HOME}/include -fopenmp
ALPAKA_ROCM = -DALPAKA_ACC_GPU_HIP_ENABLED -DALPAKA_HOST_ONLY -DALPAKA_DISABLE_VENDOR_RNG -D__HIP_PLATFORM_HCC__ -D__HIP_PLATFORM_AMD__
CFLAGS = $(ROOTCFLAGS) -Wall -Wno-unused-function -g -O2 -fPIC -fno-var-tracking -ISDL -I$(shell pwd) -Icode -Icode/core -I${CUDA_HOME}/include -I${ROCM_ROOT}/include -fopenmp
EXTRACFLAGS = $(shell rooutil-config) -g
EXTRAFLAGS = -fPIC -ITMultiDrawTreePlayer -Wunused-variable -lTMVA -lEG -lGenVector -lXMLIO -lMLP -lTreePlayer -L${CUDA_HOME}/lib64 -lcudart -fopenmp
EXTRAFLAGS = -fPIC -ITMultiDrawTreePlayer -Wunused-variable -lTMVA -lEG -lGenVector -lXMLIO -lMLP -lTreePlayer -L${CUDA_HOME}/lib64 -lcudart -L${ROCM_ROOT}/lib -lamdhip64 -fopenmp
ariostas marked this conversation as resolved.
Show resolved Hide resolved
DOQUINTUPLET = #-DFP16_Base
PTCUTFLAG =
CUTVALUEFLAG =
Expand Down
4 changes: 4 additions & 0 deletions bin/sdl_make_tracklooper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,10 @@ elif ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"cuda"* ]]) && [ !
echo "ERROR: bin/sdl_cuda failed to compile!" | tee -a ${LOG}
echo "See ${LOG} file for more detail..." | tee -a ${LOG}
exit 1
elif ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"rocm"* ]]) && [ ! -f bin/sdl_rocm ]; then
echo "ERROR: bin/sdl_rocm failed to compile!" | tee -a ${LOG}
echo "See ${LOG} file for more detail..." | tee -a ${LOG}
exit 1
fi

# Make a symlink with priority CUDA > CPU > ROCM
Expand Down