From c0d5aa025a112e96703ea9d36cbc5dfab8a36710 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Wed, 21 Sep 2016 12:07:20 +0200 Subject: [PATCH] Fixing Packer for general packing --- example/Vector/4_complex_prop/Makefile | 8 ++++---- openfpm_data | 2 +- openfpm_vcluster | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example/Vector/4_complex_prop/Makefile b/example/Vector/4_complex_prop/Makefile index 93fc158bd..47ec488c5 100644 --- a/example/Vector/4_complex_prop/Makefile +++ b/example/Vector/4_complex_prop/Makefile @@ -7,8 +7,10 @@ LDIR = OBJ = main.o OBJ_SER = main_ser.o +all: vect_cp vect_ser + %.o: %.cpp - $(CC) -O3 -c --std=c++11 -o $@ $< $(INCLUDE_PATH) + $(CC) -O0 -g -c --std=c++11 -o $@ $< $(INCLUDE_PATH) vect_cp: $(OBJ) $(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS) @@ -16,13 +18,11 @@ vect_cp: $(OBJ) vect_ser: $(OBJ_SER) $(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS) -all: vect_cp vect_ser - run: all source $$HOME/openfpm_vars && mpirun -np 2 ./vect_cp && mpirun -np 2 ./vect_ser .PHONY: clean all run clean: - rm -f *.o *~ core vect + rm -f *.o *~ core vect_cp vect_ser diff --git a/openfpm_data b/openfpm_data index f378ee11c..e1dae56f0 160000 --- a/openfpm_data +++ b/openfpm_data @@ -1 +1 @@ -Subproject commit f378ee11c3aa2be8d0fde9fe5308d86d1d705aa7 +Subproject commit e1dae56f0742ee6b4c2e39ea92fdbfc0ad301822 diff --git a/openfpm_vcluster b/openfpm_vcluster index b84c798cc..83903de6f 160000 --- a/openfpm_vcluster +++ b/openfpm_vcluster @@ -1 +1 @@ -Subproject commit b84c798cc25b8dbcc02c7642948aca3eacba9a4c +Subproject commit 83903de6f7d93f11f24e66d6a02d020358eed427 -- GitLab