polygeist

ivanradanov · Oct 5, 2023 · c60e7a0 · c60e7a0
1 parent 8619f44
commit c60e7a0
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/common/common.polygeist.host.make.config b/common/common.polygeist.host.make.config
@@ -18,6 +18,7 @@ POLYGEIST_ALTERNATIVES_MODE = static
 
 ### OPTIONS END ###
 
+LLVM_VERSION = 18
 
 ifeq ($(POLYGEIST_DEBUG),1)
     POLYGEIST_DIR = $(POLYGEIST_DIR_DEBUG)
@@ -48,7 +49,7 @@ ifeq ($(CONFIG),0)
     NVCC = $(POLYGEIST_LLVM_DIR)/bin/clang++
     LINKER = clang
 
-    CC_FLAGS = $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/16.0.0/ -fopenmp -I$(CUDA_PATH)/include/
+    CC_FLAGS = $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/$(LLVM_VERSION)/ -fopenmp -I$(CUDA_PATH)/include/
     ifeq ($(API),CUDA)
         CC_FLAGS += -I$(CUDA_PATH)/include/
     else ifeq ($(API),HIP)
@@ -187,7 +188,7 @@ else
 
         LINKER_FLAGS = -L$(CPUCUDA_BUILD_DIR)/src/ -lcpucudart -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ -fopenmp $(OPTLEVEL) -fopenmp=libomp
 
-        CC_FLAGS += $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/16.0.0/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -I$(CUDA_PATH)/include/
+        CC_FLAGS += $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/$(LLVM_VERSION)/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -I$(CUDA_PATH)/include/
         CXX_FLAGS := $(CC_FLAGS)
         NVCC_FLAGS := $(CC_FLAGS) --cuda-gpu-arch=sm_60 --cuda-path=$(CUDA_PATH)/
 
@@ -337,7 +338,7 @@ else
 
         LINKER_FLAGS = -L/usr/local/cuda/lib64/ -lcudart_static -lcuda -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ $(OPTLEVEL) -fopenmp -fopenmp=libomp
 
-        CC_FLAGS += $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/16.0.0/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -I$(CUDA_PATH)/include/
+        CC_FLAGS += $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/$(LLVM_VERSION)/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -I$(CUDA_PATH)/include/
         CXX_FLAGS := $(CC_FLAGS)
         NVCC_FLAGS := $(CC_FLAGS) --cuda-gpu-arch=$(CUDA_GPU_ARCH) --cuda-path=$(CUDA_PATH)/
 
@@ -354,7 +355,7 @@ else
 
         LINKER_FLAGS = -L/opt/rocm/lib/ -lamdhip64 -ldl -lrt -lpthread -lm -L$(POLYGEIST_LLVM_DIR)/lib -lstdc++ $(OPTLEVEL) -fopenmp -fopenmp=libomp
 
-        CC_FLAGS += $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/16.0.0/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -I$(CUDA_PATH)/include/
+        CC_FLAGS += $(OPTLEVEL) -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -resource-dir=$(POLYGEIST_LLVM_DIR)/lib/clang/$(LLVM_VERSION)/ -I$(POLYGEIST_LLVM_DIR)/projects/openmp/runtime/src/ -I$(CUDA_PATH)/include/
         CXX_FLAGS := $(CC_FLAGS)
         NVCC_FLAGS := $(CC_FLAGS) --cuda-gpu-arch=$(CUDA_GPU_ARCH) --amd-gpu-arch=$(AMD_GPU_ARCH) --cuda-path=$(CUDA_PATH)/ --rocm-path=$(ROCM_PATH)/
 
@@ -387,6 +388,9 @@ else
 
 endif
 
+CXX_FLAGS += -std=c++17
+NVCC_FLAGS += -std=c++17
+
 ifeq ($(OUTPUT_LLVMIR),1)
     CC_FLAGS += -S -emit-llvm
     CXX_FLAGS += -S -emit-llvm