Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor fixes #158

Merged
merged 3 commits into from
Jun 10, 2021
Merged

Minor fixes #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3081e2f
fix warning for python_doc target
tomcucinotta Jun 10, 2021
2eac363
added r_install target
tomcucinotta May 22, 2020
b7509ee
add --with-cuda-nvcc-flags when using --with-cuda
tomcucinotta May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ bindir = @bindir@
srcdir = @srcdir@
VPATH = @srcdir@

all clean install uninstall lib libwrapper somoclu python python_doc python_clean python_install r r_clean matlab matlab_clean:
all clean install uninstall lib libwrapper somoclu python python_doc python_clean python_install r r_install r_clean matlab matlab_clean:
$(MAKE) -C src $@

dist: $(distdir).tar.gz
Expand Down
8 changes: 8 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ fi
CUDA_PATH=/usr/local/cuda
AC_ARG_WITH([cuda],
[ --with-cuda=PATH prefix where cuda is installed [default=/usr/local/cuda]])
AC_ARG_WITH([cuda-nvcc-flags],
[ --with-cuda-nvcc-flags=FLAGS flags to be provided to NVCC])

if test x"$with_cuda" != x"no" ; then

Expand All @@ -64,6 +66,11 @@ if test x"$with_cuda" != x"no" ; then
CUDA_PATH=$with_cuda
fi

if test -n "$with_cuda_nvcc_flags"
then
CUDA_NVCC_FLAGS="$with_cuda_nvcc_flags"
fi

AC_CHECK_PROG(NVCC_CHECK,nvcc,yes,no,$CUDA_PATH/bin)
if test x"$NVCC_CHECK" = x"yes" ; then
cuda_enabled=yes
Expand All @@ -76,6 +83,7 @@ if test x"$with_cuda" != x"no" ; then
fi
NVCC="$CUDA_PATH/bin/nvcc"
AC_SUBST(CUDA_CFLAGS)
AC_SUBST(CUDA_NVCC_FLAGS)
AC_SUBST(CUDA_LIBS)
AC_SUBST(CUDA_LDFLAGS)
AC_SUBST(NVCC)
Expand Down
6 changes: 5 additions & 1 deletion src/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM= @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
CUDA_NVCC_FLAGS = @CUDA_NVCC_FLAGS@
CUDA_CFLAGS = @CUDA_CFLAGS@
CUDA_LIBS = @CUDA_LIBS@
CUDA_LDFLAGS = @CUDA_LDFLAGS@
Expand Down Expand Up @@ -79,7 +80,7 @@ somoclu: $(OBJS)
$(CXX) $(DEFS) $(CXXFLAGS) ${MPI_INC} -I$(srcdir) -I.. -o $@ -c $<

%.cu.co: %.cu
$(NVCC) $(DEFS) $(CUDA_CFLAGS) ${MPI_INC} -I$(srcdir) -I.. -o $@ -c $<
$(NVCC) $(CUDA_NVCC_FLAGS) $(DEFS) $(CUDA_CFLAGS) ${MPI_INC} -I$(srcdir) -I.. -o $@ -c $<

matlab: libwrapper
if [ -e denseGpuKernels.cu.co ]; then cp denseGpuKernels.cu.co denseGpuKernels.cu.o; fi
Expand Down Expand Up @@ -150,6 +151,9 @@ r:
gzip -f ./R/data/rgbs.txt
R CMD build R

r_install:
R CMD INSTALL Rsomoclu_$(shell grep Version R/DESCRIPTION | sed -e 's/Version: //').tar.gz

clean: python_clean r_clean matlab_clean
-rm -fr $(OBJS) somoclu ${libname} *.cu.o 1>/dev/null

Expand Down
2 changes: 1 addition & 1 deletion src/Python/doc/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
#'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
'preamble': '\usepackage{amssymb}',
'preamble': '\\usepackage{amssymb}',
}

# Grouping the document tree into LaTeX files. List of tuples
Expand Down