Skip to content
Snippets Groups Projects
Commit 3fc6bb0a authored by John Romein's avatar John Romein
Browse files

Fixed dependency

parent 7cc7e6fa
No related branches found
No related tags found
1 merge request!1Add CUDA-wrappers submodule to replace util/cu.* and util/nvrtc.*
Show whitespace changes
Inline Side-by-side
Showing
with 9 additions and 9 deletions
Makefile
+ 9
− 9
View file @ 3fc6bb0a
...@@ -51,13 +51,13 @@ EXECUTABLES= test/SimpleExample/SimpleExample\ ...@@ -51,13 +51,13 @@ EXECUTABLES= test/SimpleExample/SimpleExample\
test/OpenCLCorrelatorTest/OpenCLCorrelatorTest test/OpenCLCorrelatorTest/OpenCLCorrelatorTest
CUDA_WRAPPERS_DIR= external/cuda-wrappers CUDA_WRAPPERS_DIR= external/cuda-wrappers
CUDA_WRAPERS_LIB= ${CUDA_WRAPPERS_DIR}/libcu.so CUDA_WRAPPERS_LIB= $(CUDA_WRAPPERS_DIR)/libcu.so
CUDA_WRAPERS_INCLUDE= ${CUDA_WRAPPERS_DIR}/cu CUDA_WRAPPERS_INCLUDE= $(CUDA_WRAPPERS_DIR)/cu
#LIBTCC_OBJECTS+= ${CUDA_WRAPERS_LIB} #LIBTCC_OBJECTS+= $(CUDA_WRAPPERS_LIB)
LIBRARIES= -L$(CUDA_LIBDIR) -lcuda\ LIBRARIES= -L$(CUDA_LIBDIR) -lcuda\
${CUDA_WRAPERS_LIB} \ $(CUDA_WRAPPERS_LIB) \
-L${NVRTC_LIBDIR} -lnvrtc -L$(NVRTC_LIBDIR) -lnvrtc
#-L$(POWER_SENSOR)/lib -lpowersensor #-lnvidia-ml #-L$(POWER_SENSOR)/lib -lpowersensor #-lnvidia-ml
...@@ -85,9 +85,9 @@ all:: $(EXECUTABLES) ...@@ -85,9 +85,9 @@ all:: $(EXECUTABLES)
clean:: clean::
$(RM) $(OBJECTS) $(SHARED_OBJECTS) $(DEPENDENCIES) $(EXECUTABLES) $(RM) $(OBJECTS) $(SHARED_OBJECTS) $(DEPENDENCIES) $(EXECUTABLES)
${CUDA_WRAPERS_LIB}: $(CUDA_WRAPPERS_LIB):
cd ${CUDA_WRAPPERS_DIR} && cmake . cd $(CUDA_WRAPPERS_DIR) && cmake .
cd ${CUDA_WRAPPERS_DIR} && CPATH=${CPATH}:${CUDA_INCLUDE} make cd $(CUDA_WRAPPERS_DIR) && CPATH=$(CPATH):$(CUDA_INCLUDE) make
libtcc/TCCorrelator.o: libtcc/TCCorrelator.cu # CUDA code embedded in object file libtcc/TCCorrelator.o: libtcc/TCCorrelator.cu # CUDA code embedded in object file
ld -r -b binary -o $@ $< ld -r -b binary -o $@ $<
...@@ -95,7 +95,7 @@ libtcc/TCCorrelator.o: libtcc/TCCorrelator.cu # CUDA code embedded in object fil ...@@ -95,7 +95,7 @@ libtcc/TCCorrelator.o: libtcc/TCCorrelator.cu # CUDA code embedded in object fil
libtcc/TCCorrelator.d: libtcc/TCCorrelator.d:
- -
libtcc/libtcc.so.$(VERSION): $(LIBTCC_OBJECTS) libtcc/libtcc.so.$(VERSION): $(LIBTCC_OBJECTS) $(CUDA_WRAPPERS_LIB)
$(CXX) -shared -o $@ $^ $(LIBRARIES) $(CXX) -shared -o $@ $^ $(LIBRARIES)
test/SimpleExample/SimpleExample: $(SIMPLE_EXAMPLE_OBJECTS) libtcc/libtcc.so test/SimpleExample/SimpleExample: $(SIMPLE_EXAMPLE_OBJECTS) libtcc/libtcc.so
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment