Skip to content
Snippets Groups Projects
Commit 2143fc3d authored by Wang, Ruonan's avatar Wang, Ruonan
Browse files

for merge

parents 4fa1c5cf 2841268b
No related branches found
No related tags found
1 merge request!8Integrate groupless
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Author: wfg # Author: wfg
#DEFAULT COMPILERS IN PATH, LIBS will be modified in Makefile.libs #DEFAULT COMPILERS IN PATH, LIBS will be modified in Makefile.libs
CC:=g++ CC:=g++-6
AR:=ar AR:=ar
MPICC:=mpic++ MPICC:=mpic++
LIBS:= LIBS:=
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Created on: Feb 9, 2017 # Created on: Feb 9, 2017
# Author: wfg # Author: wfg
DATAMAN_LOCATION=/home/wfg/Applications/DataMan DATAMAN_LOCATION=/Users/w4g/Dropbox/lib/DataMan
echo "######################################################################################" echo "######################################################################################"
echo "Start building ADIOS ./lib/libadios.a ./libadios_nompi.a with DataMan library" echo "Start building ADIOS ./lib/libadios.a ./libadios_nompi.a with DataMan library"
echo "######################################################################################" echo "######################################################################################"
......
...@@ -28,16 +28,16 @@ CFLAGS=-Wall -O0 -g -Wpedantic -std=c++11 ...@@ -28,16 +28,16 @@ CFLAGS=-Wall -O0 -g -Wpedantic -std=c++11
#SYSTEM LIBS #SYSTEM LIBS
LIB+= -lpthread LIB+= -lpthread
LIB_NOMPI+= -lpthread LIB_NOMPI+= -ldl -lpthread
all: mpi nompi all: mpi nompi
mpi: $(ADIOS_LIB) $(ADIOS_HFiles) mpi: $(ADIOS_LIB) $(ADIOS_HFiles)
$(MPICC) $(CFLAGS) $(INC) -DHAVE_MPI -DHAVE_DATAMAN $(BASE_NAME).cpp -o $(BASE_NAME).exe $(LIB) -lpthread $(MPICC) $(CFLAGS) $(INC) -DHAVE_MPI -DHAVE_DATAMAN $(BASE_NAME).cpp -o $(BASE_NAME).exe $(LIB)
nompi: $(ADIOS_NOMPI_LIB) $(NoMPI_HFiles) nompi: $(ADIOS_NOMPI_LIB) $(NoMPI_HFiles)
$(CC) $(CFLAGS) $(INC) -DHAVE_DATAMAN $(BASE_NAME)_nompi.cpp -o $(BASE_NAME)_nompi.exe $(LIB_NOMPI) -lpthread $(CC) $(CFLAGS) $(INC) -DHAVE_DATAMAN $(BASE_NAME)_nompi.cpp -o $(BASE_NAME)_nompi.exe $(LIB_NOMPI)
clean: clean:
rm *.exe; rm *.exe;
......
...@@ -110,7 +110,6 @@ private: ...@@ -110,7 +110,6 @@ private:
m_WrittenVariables.insert( variable.m_Name ); m_WrittenVariables.insert( variable.m_Name );
DataManager dataManager; DataManager dataManager;
dataManager.add_stream( "0", "0", 1, 1, 1, "0" );
//This part will go away, this is just to monitor variables per rank //This part will go away, this is just to monitor variables per rank
std::cout << "I am hooked to the DataMan library\n"; std::cout << "I am hooked to the DataMan library\n";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment