Merge branch 'master' of git.mpi-cbg.de:openfpm/openfpm_pdata

example/Vector/7_SPH_dlb_gpu/Makefile

@@ -8,7 +8,7 @@ CUDA_CC_LINK=
 CC=mpic++
 ifdef HIP
         CUDA_CC=hipcc
-        CUDA_OPTIONS=-D__NVCC__ -D__HIP__ -DCUDART_VERSION=11000 -D__CUDACC__ -D__CUDACC_VER_MAJOR__=11 -D__CUDACC_VER_MINOR__=0 -D__CUDACC_VER_BUILD__=0
+        CUDA_OPTIONS= -D__NVCC__ -D__HIP__ -DCUDART_VERSION=11000 -D__CUDACC__ -D__CUDACC_VER_MAJOR__=11 -D__CUDACC_VER_MINOR__=0 -D__CUDACC_VER_BUILD__=0
         LIBS_SELECT=$(LIBS)
         CC=hipcc
 	CUDA_CC_LINK=hipcc
@@ -44,7 +44,7 @@ sph_dlb_test: OPT += -DTEST_RUN
 sph_dlb_test: sph_dlb
 
 %.o: %.cu
-	$(CUDA_CC) $(CUDA_OPTIONS) -O3 $(OPT) -g -c --std=c++14 -o $@ $< $(INCLUDE_PATH_NVCC)
+	$(CUDA_CC) $(CUDA_OPTIONS) $(OPT) -g -c --std=c++14 -o $@ $< $(INCLUDE_PATH_NVCC)
 
 %.o: %.cpp
 	$(CC) -O3 $(OPT) -g -c --std=c++14 -o $@ $< $(INCLUDE_PATH)

install

@@ -460,7 +460,7 @@ fi
 ################ Parallel debugger #######################
 
 echo "Installing parallel debugger"
-install_gdbgui
+install_gdbgui $i_dir
 
 ###########################################################
 

openfpm_numerics @ be31957a

-Subproject commit 6205db92062bc26a65f2b9ebacd42e81b806d939
+Subproject commit be31957a785f39a94b9f256463be9753053467e8

script/install_gdbgui

@@ -10,12 +10,22 @@ source script/solve_gdbserver
 source script/discover_package_manager
 source script/solve_nodejs
 source script/solve_python_devel
+source script/solve_llvm
 
 node_js_inst=0
 
 if [ x"$platform" == x"osx" ]; then
-	echo -e "node\033[91;5;1m The parallel debugger at the moment is not supported on OSX \033[0m"
-	return
+	solve_llvm $platform
+
+	echo "OSX installing lldb-mi"
+	rm lldb-mi-master.tar.gz
+	wget http://ppmcore.mpi-cbg.de/upload/lldb-mi-master.tar.gz
+	tar -xf lldb-mi-master.tar.gz
+	cd lldb-mi-master
+	mkdir build
+	cd build
+	cmake ../. -DCMAKE_PREFIX_PATH=$1/LLDB-MI
+	make 
 fi
 
 solve_python_devel $platform

script/solve_llvm

+#! /bin/bash
+
+function solve_llvm() {
+source script/show_solutions
+source script/discover_package_manager
+discover_package_manager $1
+pcman=$discover_package_manager_ret
+
+if [ x"$pcman" = x"" ]; then
+        exit 1
+fi
+
+
+if [ x"$pcman" == x"brew" ]; then
+        base_llvm_pkg="llvm"
+fi
+
+if [ x"$1" = x"osx"  ]; then
+        pc_install_command "$pcman"
+        commands[0]="su -c \"$pc_install_command_ret $base_python_pkg \""
+        commands[1]="sudo $pc_install_command_ret $base_python_pkg "
+        possible_solutions "${commands[@]}"
+fi
+}
+

src/scripts/postflight

 #! /bin/bash
 
-sed -i '' -e 's/Users\/vagrant/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/source/openfpm_vars
-sed -i '' -e 's/Users\/vagrant/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/openfpm_pdata/include/example.mk
+sed -i '' -e 's/Users\/rundeck/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/source/openfpm_vars
+sed -i '' -e 's/openfpm_pre/openfpm/g' /usr/local/openfpm/source/openfpm_vars
+sed -i '' -e 's/dependencies\/openfpm_dependencies/dependencies/g' /usr/local/openfpm/source/openfpm_vars
+sed -i '' -e 's/Users\/rundeck/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/openfpm_pdata/include/example.mk
+sed -i '' -e 's/openfpm_pre/openfpm/g' /usr/local/openfpm/openfpm_pdata/include/example.mk
+sed -i '' -e 's/dependencies\/openfpm_dependencies/dependencies/g' /usr/local/openfpm/openfpm_pdata/include/example.mk
+
+chmod a+x /usr/local/openfpm/dependencies/MPI/bin/*
+
 echo "export OPAL_PREFIX=/usr/local/openfpm/dependencies/MPI" >> /usr/local/openfpm/source/openfpm_vars
- 
+