For the moment, don't build BP5 unless SST is built

ornladios · Apr 15, 2021 · 46aba22 · 46aba22
1 parent 404635f
commit 46aba22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/source/adios2/CMakeLists.txt b/source/adios2/CMakeLists.txt
@@ -82,10 +82,6 @@ add_library(adios2_core
   toolkit/format/bp/bp4/BP4Serializer.cpp toolkit/format/bp/bp4/BP4Serializer.tcc
   toolkit/format/bp/bp4/BP4Deserializer.cpp toolkit/format/bp/bp4/BP4Deserializer.tcc
 
-  toolkit/format/bp5/BP5Base.cpp
-  toolkit/format/bp5/BP5Serializer.cpp
-  toolkit/format/bp5/BP5Deserializer.cpp  toolkit/format/bp5/BP5Deserializer.tcc
-
   toolkit/format/bp/bpOperation/BPOperation.cpp 
   toolkit/format/bp/bpOperation/BPOperation.tcc
   toolkit/format/bp/bpOperation/compress/BPZFP.cpp 
@@ -213,6 +209,11 @@ endif()
 if(ADIOS2_HAVE_SST)
   add_subdirectory(toolkit/sst)
   target_sources(adios2_core PRIVATE
+
+    toolkit/format/bp5/BP5Base.cpp
+    toolkit/format/bp5/BP5Serializer.cpp
+    toolkit/format/bp5/BP5Deserializer.cpp  toolkit/format/bp5/BP5Deserializer.tcc
+
     engine/sst/SstReader.cpp
     engine/sst/SstWriter.cpp
     engine/sst/SstParamParser.cpp

diff --git a/source/adios2/toolkit/format/bp5/BP5Serializer.cpp b/source/adios2/toolkit/format/bp5/BP5Serializer.cpp
@@ -668,10 +668,11 @@ BP5Serializer::TimestepInfo BP5Serializer::CloseTimestep(int timestep)
                       Info.AttributeData, &AttributeSize);
         AttrData =
             new BufferFFS(AttributeEncodeBuffer, AttributeBlock, AttributeSize);
-        FMdump_encoded_data(Info.AttributeFormat, AttributeBlock, 1024000);
+        //        FMdump_encoded_data(Info.AttributeFormat, AttributeBlock,
+        //        1024000);
     }
 
-    FMdump_encoded_data(Info.MetaFormat, MetaDataBlock, 1024000);
+    //    FMdump_encoded_data(Info.MetaFormat, MetaDataBlock, 1024000);
     /* free all those copied dimensions, etc */
     MBase = (struct FFSMetadataInfoStruct *)Metadata;
     size_t *tmp = MBase->BitField;