Skip to content
Snippets Groups Projects
Commit e340f2a4 authored by ac_21's avatar ac_21
Browse files

fixes for mex path

parent 515e6aec
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 6 additions and 6 deletions
src/c/makefile 100644 → 100755
+ 6
− 6
View file @ e340f2a4
######################################### #########################################
# Set these for MATLAB/Python versions # Set these for MATLAB/Python versions
######################################### #########################################
MATALAB_DIR = /usr/local/MATLAB/R2018b MATALAB_DIR = /usr/local/MATLAB/R2017b
# NOTE: Currently only builds against python3 # NOTE: Currently only builds against python3
PYTHON_VER = python3.5 PYTHON_VER = python3.6m
PYTHON3_INC = /usr/include/$(PYTHON_VER) PYTHON3_INC = /usr/include/$(PYTHON_VER)
NUMPY3_INC = /usr/include/$(PYTHON_VER) NUMPY3_INC = /usr/include/$(PYTHON_VER)
PYTHON_LIB = /usr/lib/$(PYTHON_VER)/config-3.5m-x86_64-linux-gnu PYTHON_LIB = /usr/lib/$(PYTHON_VER)/config-3.5m-x86_64-linux-gnu
...@@ -27,7 +27,7 @@ PY_CPP_OBJ = $(addprefix $(OBJ_DIR)/,$(notdir $(PY_CPP_FILES:.cpp=.o))) ...@@ -27,7 +27,7 @@ PY_CPP_OBJ = $(addprefix $(OBJ_DIR)/,$(notdir $(PY_CPP_FILES:.cpp=.o)))
SCRPY_CPP_OBJ = $(addprefix $(OBJ_DIR)/Py,$(notdir $(SCR_CPP_FILES:.cpp=.o))) SCRPY_CPP_OBJ = $(addprefix $(OBJ_DIR)/Py,$(notdir $(SCR_CPP_FILES:.cpp=.o)))
SCRMEX_CPP_OBJ = $(addprefix $(OBJ_DIR)/Mx,$(notdir $(SCR_CPP_FILES:.cpp=.o))) SCRMEX_CPP_OBJ = $(addprefix $(OBJ_DIR)/Mx,$(notdir $(SCR_CPP_FILES:.cpp=.o)))
CUDA_INC = -I. -I./Cuda CUDA_INC = -I. -I./Cuda -I/usr/local/cuda/include
MEX_INC = -I. -I./Mex -I./ScriptCmds -I./external -I$(MATALAB_DIR)/extern/include MEX_INC = -I. -I./Mex -I./ScriptCmds -I./external -I$(MATALAB_DIR)/extern/include
PY_INC = -I. -I./Python -I./ScriptCmds -I./external -I$(PYTHON3_INC) -I$(NUMPY3_INC) PY_INC = -I. -I./Python -I./ScriptCmds -I./external -I$(PYTHON3_INC) -I$(NUMPY3_INC)
...@@ -71,7 +71,7 @@ OMP_LIB = -lgomp ...@@ -71,7 +71,7 @@ OMP_LIB = -lgomp
######################################### #########################################
# gcc/g++/clang parameters # gcc/g++/clang parameters
######################################### #########################################
GCC_FLAGS = $(CPP_FLAGS) $(C_FLAGS) GCC_FLAGS = $(CPP_FLAGS) $(C_FLAGS) -static
GCC_LIBS = $(OMP_LIB) GCC_LIBS = $(OMP_LIB)
######################################### #########################################
...@@ -92,7 +92,7 @@ matlab: Mex.mexa64 ...@@ -92,7 +92,7 @@ matlab: Mex.mexa64
HIP.so: $(CUDA_OBJ) $(PY_CPP_OBJ) $(SCRPY_CPP_OBJ) $(CUDA_CPP_OBJ) HIP.so: $(CUDA_OBJ) $(PY_CPP_OBJ) $(SCRPY_CPP_OBJ) $(CUDA_CPP_OBJ)
$(NVCC_PATH) $(GCC_LIBS) $(PY_LIB) -shared $^ -o HIP.so $(SMODEL) --linker-options '$(LD_FLAGS)' $(NVCC_PATH) $(GCC_LIBS) $(PY_LIB) -shared $^ -o HIP.so $(SMODEL) --linker-options '$(LD_FLAGS)'
Mex.mexa64: $(CUDA_OBJ) $(MEX_CPP_OBJ) $(SCRMX_CPP_OBJ) $(CUDA_CPP_OBJ) Mex.mexa64: $(CUDA_OBJ) $(MEX_CPP_OBJ) $(SCRMEX_CPP_OBJ) $(CUDA_CPP_OBJ)
$(NVCC_PATH) $(GCC_LIBS) $(MEX_LIB) -shared $^ -o Mex.mexa64 $(SMODEL) --linker-options '$(LD_FLAGS)' $(NVCC_PATH) $(GCC_LIBS) $(MEX_LIB) -shared $^ -o Mex.mexa64 $(SMODEL) --linker-options '$(LD_FLAGS)'
######################################### #########################################
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment