From 3771c79e11b64016800b7989fccf62484cb149cd Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Tue, 18 Apr 2017 13:30:19 -0400
Subject: [PATCH] Move non-public headers into the source directory
---
.../hdf5Writer/helloHDF5Writer_nompi.cpp | 79 ++++++-------------
examples/hello/timeBP/timeBPWriter_nompi.cpp | 31 ++++----
include/ADIOS_CPP.h | 11 ---
source/CMakeLists.txt | 1 +
source/capsule/heap/STLVector.cpp | 2 +-
{include => source}/capsule/heap/STLVector.h | 0
source/capsule/shmem/ShmSystemV.cpp | 2 +-
.../capsule/shmem/ShmSystemV.h | 0
source/engine/adios1/ADIOS1Reader.cpp | 5 +-
.../engine/adios1/ADIOS1Reader.h | 0
source/engine/adios1/ADIOS1Writer.cpp | 4 +-
.../engine/adios1/ADIOS1Writer.h | 0
source/engine/bp/BPFileReader.cpp | 2 +-
{include => source}/engine/bp/BPFileReader.h | 0
source/engine/bp/BPFileWriter.cpp | 2 +-
{include => source}/engine/bp/BPFileWriter.h | 3 +-
source/engine/dataman/DataManReader.cpp | 2 +-
.../engine/dataman/DataManReader.h | 3 +-
source/engine/dataman/DataManWriter.cpp | 2 +-
.../engine/dataman/DataManWriter.h | 3 +-
source/engine/hdf5/HDF5ReaderP.cpp | 4 +-
{include => source}/engine/hdf5/HDF5ReaderP.h | 0
source/engine/hdf5/HDF5WriterP.cpp | 2 +-
{include => source}/engine/hdf5/HDF5WriterP.h | 4 +-
source/transform/BZip2.cpp | 2 +-
{include => source}/transform/BZip2.h | 0
source/transport/file/FStream.cpp | 2 +-
{include => source}/transport/file/FStream.h | 0
source/transport/file/FileDescriptor.cpp | 2 +-
.../transport/file/FileDescriptor.h | 0
source/transport/file/FilePointer.cpp | 2 +-
.../transport/file/FilePointer.h | 0
{include => source}/transport/file/MPI_File.h | 2 +-
source/transport/wan/MdtmMan.cpp | 2 +-
{include => source}/transport/wan/MdtmMan.h | 0
.../utilities/format/bp1/BP1.h | 0
source/utilities/format/bp1/BP1Aggregator.cpp | 2 +-
.../utilities/format/bp1/BP1Aggregator.h | 0
source/utilities/format/bp1/BP1Base.cpp | 2 +-
.../utilities/format/bp1/BP1Base.h | 0
.../utilities/format/bp1/BP1Structs.h | 0
source/utilities/format/bp1/BP1Writer.cpp | 2 +-
.../utilities/format/bp1/BP1Writer.h | 0
source/utilities/format/bp1/BP1Writer.tcc | 2 +-
source/utilities/realtime/dataman/DataMan.cpp | 2 +-
.../utilities/realtime/dataman/DataMan.h | 0
.../realtime/dataman/DataManBase.cpp | 2 +-
.../utilities/realtime/dataman/DataManBase.h | 0
48 files changed, 72 insertions(+), 114 deletions(-)
rename {include => source}/capsule/heap/STLVector.h (100%)
rename {include => source}/capsule/shmem/ShmSystemV.h (100%)
rename {include => source}/engine/adios1/ADIOS1Reader.h (100%)
rename {include => source}/engine/adios1/ADIOS1Writer.h (100%)
rename {include => source}/engine/bp/BPFileReader.h (100%)
rename {include => source}/engine/bp/BPFileWriter.h (99%)
rename {include => source}/engine/dataman/DataManReader.h (99%)
rename {include => source}/engine/dataman/DataManWriter.h (99%)
rename {include => source}/engine/hdf5/HDF5ReaderP.h (100%)
rename {include => source}/engine/hdf5/HDF5WriterP.h (97%)
rename {include => source}/transform/BZip2.h (100%)
rename {include => source}/transport/file/FStream.h (100%)
rename {include => source}/transport/file/FileDescriptor.h (100%)
rename {include => source}/transport/file/FilePointer.h (100%)
rename {include => source}/transport/file/MPI_File.h (97%)
rename {include => source}/transport/wan/MdtmMan.h (100%)
rename {include => source}/utilities/format/bp1/BP1.h (100%)
rename {include => source}/utilities/format/bp1/BP1Aggregator.h (100%)
rename {include => source}/utilities/format/bp1/BP1Base.h (100%)
rename {include => source}/utilities/format/bp1/BP1Structs.h (100%)
rename {include => source}/utilities/format/bp1/BP1Writer.h (100%)
rename {include => source}/utilities/realtime/dataman/DataMan.h (100%)
rename {include => source}/utilities/realtime/dataman/DataManBase.h (100%)
diff --git a/examples/hello/hdf5Writer/helloHDF5Writer_nompi.cpp b/examples/hello/hdf5Writer/helloHDF5Writer_nompi.cpp
index 6f19e961f..d2c79ad1d 100644
--- a/examples/hello/hdf5Writer/helloHDF5Writer_nompi.cpp
+++ b/examples/hello/hdf5Writer/helloHDF5Writer_nompi.cpp
@@ -37,45 +37,29 @@ int main(int argc, char *argv[])
myCDoubles.emplace_back(2, 2);
myCDoubles.emplace_back(3, 1);
- std::size_t doubleVCount = Nx / size;
- std::size_t floatCount = CFloatSize / size;
- std::size_t intCountDim1 = intDim1 / size;
+ std::size_t doubleVCount = Nx;
+ std::size_t floatCount = CFloatSize;
+ std::size_t intCountDim1 = intDim1;
- std::size_t doubleVOffset = rank * doubleVCount;
- std::size_t floatOffset = rank * floatCount;
- std::size_t intOffsetDim1 = rank * intCountDim1;
+ std::size_t doubleVOffset = 0;
+ std::size_t floatOffset = 0;
+ std::size_t intOffsetDim1 = 0;
std::size_t intOffsetDim2 = 0;
- if ((size > 1) && (rank == size - 1))
- {
- doubleVCount = Nx - rank * (Nx / size);
- floatCount = CFloatSize - rank * (CFloatSize / size);
- intCountDim1 = intDim1 - rank * (intDim1 / size);
- }
-
try
{
// Define variable and local size
- // auto& ioMyDoubles = adios.DefineVariable<double>( "myDoubles", {Nx},
- // {Nx} );
- // auto& ioMyCFloats = adios.DefineVariable<std::complex<float>>(
- // "myCFloats", {3}, {3} );
- // auto& ioMyInts = adios.DefineVariable<int>( "myInts", {4,3}, {4,3} );
-
- auto &ioMyDoubles = adios.DefineVariable<double>(
- "myDoubles", {doubleVCount}, {Nx}, {doubleVOffset});
- auto &ioMyCFloats = adios.DefineVariable<std::complex<float>>(
- "myCFloats", {floatCount}, {3}, {floatOffset});
- auto &ioMyCDoubles = adios.DefineVariable<std::complex<double>>(
- "myCDoubles", {floatCount}, {3}, {floatOffset});
- auto &ioMyInts =
- adios.DefineVariable<int>("myInts", {intCountDim1, intDim2}, {4, 3},
- {intOffsetDim1, intOffsetDim2});
+ auto &ioMyDoubles =
+ adios.DefineVariable<double>("myDoubles", {Nx}, {Nx});
+ auto &ioMyCFloats =
+ adios.DefineVariable<std::complex<float>>("myCFloats", {3}, {3});
+ auto &ioMyCDoubles =
+ adios.DefineVariable<std::complex<double>>("myCDoubles", {3}, {3});
+ auto &ioMyInts = adios.DefineVariable<int>("myInts", {4, 3}, {4, 3});
// Define method for engine creation, it is basically straight-forward
// parameters
- adios::Method &HDF5Settings =
- adios.DeclareMethod("HDF5Writer"); // default method type is Writer
+ adios::Method &HDF5Settings = adios.DeclareMethod("HDF5Writer");
HDF5Settings.SetParameters("chunck=yes", "collectiveIO=yes");
// HDF5Settings.AddTransport( "Mdtm", "localIP=128.0.0.0.1",
// "remoteIP=128.0.0.0.2", "tolerances=1,2,3" );
@@ -86,44 +70,33 @@ int main(int argc, char *argv[])
auto HDF5Writer = adios.Open("test.bp", "w", HDF5Settings);
if (HDF5Writer == nullptr)
+ {
throw std::ios_base::failure(
"ERROR: failed to create HDF5 I/O engine at Open\n");
+ }
- HDF5Writer->Write(ioMyDoubles, myDoubles.data() +
- doubleVOffset); // Base class Engine
- // own the Write<T>
- // that will call
- // overloaded Write
- // from Derived
- HDF5Writer->Write(ioMyInts,
- myInts.data() + (intOffsetDim1 * intDim2 * rank));
+ // Base class Engine own the Write<T> that will call overloaded Write
+ // from Derived
+ HDF5Writer->Write(ioMyDoubles, myDoubles.data() + doubleVOffset);
+ HDF5Writer->Write(ioMyInts, myInts.data());
HDF5Writer->Write(ioMyCFloats, myCFloats.data());
HDF5Writer->Write(ioMyCDoubles, myCDoubles.data());
HDF5Writer->Close();
}
catch (std::invalid_argument &e)
{
- if (rank == 0)
- {
- std::cout << "Invalid argument exception, STOPPING PROGRAM\n";
- std::cout << e.what() << "\n";
- }
+ std::cout << "Invalid argument exception, STOPPING PROGRAM\n";
+ std::cout << e.what() << "\n";
}
catch (std::ios_base::failure &e)
{
- if (rank == 0)
- {
- std::cout << "System exception, STOPPING PROGRAM\n";
- std::cout << e.what() << "\n";
- }
+ std::cout << "System exception, STOPPING PROGRAM\n";
+ std::cout << e.what() << "\n";
}
catch (std::exception &e)
{
- if (rank == 0)
- {
- std::cout << "Exception, STOPPING PROGRAM\n";
- std::cout << e.what() << "\n";
- }
+ std::cout << "Exception, STOPPING PROGRAM\n";
+ std::cout << e.what() << "\n";
}
return 0;
diff --git a/examples/hello/timeBP/timeBPWriter_nompi.cpp b/examples/hello/timeBP/timeBPWriter_nompi.cpp
index 42af66f23..e562a5594 100644
--- a/examples/hello/timeBP/timeBPWriter_nompi.cpp
+++ b/examples/hello/timeBP/timeBPWriter_nompi.cpp
@@ -48,16 +48,16 @@ int main(int /*argc*/, char ** /*argv*/)
// Define method for engine creation, it is basically straight-forward
// parameters
- adios::Method &bpWriterSettings = adios.DeclareMethod(
- "SingleFile"); // default method type is BPWriter
+
+ // default method type is BPWriter
+ adios::Method &bpWriterSettings = adios.DeclareMethod("SingleFile");
bpWriterSettings.SetParameters("profile_units=mus");
- bpWriterSettings.AddTransport(
- "File", "profile_units=mus",
- "have_metadata_file=no"); // uses default POSIX library
- // Create object directly rather than using polymorphism with ADIOS.Open
- adios::BPFileWriter bpWriter(adios, "time_nompi.bp", "w",
- adios.m_MPIComm, bpWriterSettings);
+ // uses default POSIX library
+ bpWriterSettings.AddTransport("File", "profile_units=mus",
+ "have_metadata_file=no");
+
+ auto bpWriter = adios.Open("time_nompi.bp", "w",bpWriterSettings);
for (unsigned int t = 0; t < 3; ++t)
{
@@ -65,17 +65,14 @@ int main(int /*argc*/, char ** /*argv*/)
myMatrix[0] = t;
myMatrix2[0] = t;
- bpWriter.Write(ioMyDoubles,
- myDoubles.data()); // Base class Engine own
- // the Write<T> that will
- // call overloaded Write
- // from Derived
- bpWriter.Write(ioMyMatrix, myMatrix.data());
- bpWriter.Write(ioMyMatrix2, myMatrix2.data());
- bpWriter.Advance();
+ // Base class Engine own the Write<T> that will call overloaded Write from Derived
+ bpWriter->Write(ioMyDoubles, myDoubles.data());
+ bpWriter->Write(ioMyMatrix, myMatrix.data());
+ bpWriter->Write(ioMyMatrix2, myMatrix2.data());
+ bpWriter->Advance();
}
- bpWriter.Close();
+ bpWriter->Close();
}
catch (std::invalid_argument &e)
{
diff --git a/include/ADIOS_CPP.h b/include/ADIOS_CPP.h
index a5a174bfd..f1e7d56c4 100644
--- a/include/ADIOS_CPP.h
+++ b/include/ADIOS_CPP.h
@@ -17,16 +17,5 @@
#include "core/Engine.h"
#include "core/Transform.h"
-#include "engine/bp/BPFileWriter.h"
-
-// Will allow to create engines directly (no polymorphism)
-#ifdef ADIOS_HAVE_DATAMAN
-#include "engine/dataman/DataManReader.h"
-#include "engine/dataman/DataManWriter.h"
-#endif
-
-#ifdef ADIOS_HAVE_BZIP2
-#include "transform/BZip2.h"
-#endif
#endif /* ADIOS_CPP_H_ */
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 993366d5f..f088745a2 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -41,6 +41,7 @@ add_library(adios2
)
target_include_directories(adios2
PUBLIC ${ADIOS_SOURCE_DIR}/include
+ PRIVATE ${ADIOS_SOURCE_DIR}/source
)
if(ADIOS_USE_DataMan)
diff --git a/source/capsule/heap/STLVector.cpp b/source/capsule/heap/STLVector.cpp
index 99d9971e8..31a9e1845 100644
--- a/source/capsule/heap/STLVector.cpp
+++ b/source/capsule/heap/STLVector.cpp
@@ -13,7 +13,7 @@
#include <stdexcept> //std::runtime_error
/// \endcond
-#include "capsule/heap/STLVector.h"
+#include "STLVector.h"
namespace adios
{
diff --git a/include/capsule/heap/STLVector.h b/source/capsule/heap/STLVector.h
similarity index 100%
rename from include/capsule/heap/STLVector.h
rename to source/capsule/heap/STLVector.h
diff --git a/source/capsule/shmem/ShmSystemV.cpp b/source/capsule/shmem/ShmSystemV.cpp
index b26868c46..4bd56810c 100644
--- a/source/capsule/shmem/ShmSystemV.cpp
+++ b/source/capsule/shmem/ShmSystemV.cpp
@@ -14,7 +14,7 @@
#include <utility>
/// \endcond
-#include "capsule/shmem/ShmSystemV.h"
+#include "ShmSystemV.h"
namespace adios
{
diff --git a/include/capsule/shmem/ShmSystemV.h b/source/capsule/shmem/ShmSystemV.h
similarity index 100%
rename from include/capsule/shmem/ShmSystemV.h
rename to source/capsule/shmem/ShmSystemV.h
diff --git a/source/engine/adios1/ADIOS1Reader.cpp b/source/engine/adios1/ADIOS1Reader.cpp
index f938277af..2cb851c18 100644
--- a/source/engine/adios1/ADIOS1Reader.cpp
+++ b/source/engine/adios1/ADIOS1Reader.cpp
@@ -8,13 +8,14 @@
* Author: wfg
*/
-#include "engine/adios1/ADIOS1Reader.h"
#include "core/Support.h"
#include "functions/adiosFunctions.h" // CSVToVector
#include "transport/file/FStream.h" // uses C++ fstream
#include "transport/file/FileDescriptor.h" // uses POSIX
#include "transport/file/FilePointer.h" // uses C FILE*
+#include "ADIOS1Reader.h"
+
namespace adios
{
@@ -28,8 +29,6 @@ ADIOS1Reader::ADIOS1Reader(ADIOS &adios, const std::string &name,
adios_read_init_method(read_method, mpiComm, "");
}
-ADIOS1Reader::~ADIOS1Reader() {}
-
Variable<void> *
ADIOS1Reader::InquireVariable(const std::string &variableName,
const bool readIn) // not yet implemented
diff --git a/include/engine/adios1/ADIOS1Reader.h b/source/engine/adios1/ADIOS1Reader.h
similarity index 100%
rename from include/engine/adios1/ADIOS1Reader.h
rename to source/engine/adios1/ADIOS1Reader.h
diff --git a/source/engine/adios1/ADIOS1Writer.cpp b/source/engine/adios1/ADIOS1Writer.cpp
index 4a719f765..4e762b4d2 100644
--- a/source/engine/adios1/ADIOS1Writer.cpp
+++ b/source/engine/adios1/ADIOS1Writer.cpp
@@ -10,10 +10,10 @@
* Author: pnb
*/
-#include "engine/adios1/ADIOS1Writer.h"
-#include "ADIOS.h"
#include "functions/adiosFunctions.h"
+#include "ADIOS1Writer.h"
+
extern int adios_verbose_level;
extern int adios_errno;
diff --git a/include/engine/adios1/ADIOS1Writer.h b/source/engine/adios1/ADIOS1Writer.h
similarity index 100%
rename from include/engine/adios1/ADIOS1Writer.h
rename to source/engine/adios1/ADIOS1Writer.h
diff --git a/source/engine/bp/BPFileReader.cpp b/source/engine/bp/BPFileReader.cpp
index 7d49cf6d1..27632b4c5 100644
--- a/source/engine/bp/BPFileReader.cpp
+++ b/source/engine/bp/BPFileReader.cpp
@@ -8,7 +8,7 @@
* Author: wfg
*/
-#include "engine/bp/BPFileReader.h"
+#include "BPFileReader.h"
#include "core/Support.h"
#include "functions/adiosFunctions.h" // CSVToVector
diff --git a/include/engine/bp/BPFileReader.h b/source/engine/bp/BPFileReader.h
similarity index 100%
rename from include/engine/bp/BPFileReader.h
rename to source/engine/bp/BPFileReader.h
diff --git a/source/engine/bp/BPFileWriter.cpp b/source/engine/bp/BPFileWriter.cpp
index 027b60266..b83f4052f 100644
--- a/source/engine/bp/BPFileWriter.cpp
+++ b/source/engine/bp/BPFileWriter.cpp
@@ -10,7 +10,7 @@
#include <utility>
#include "ADIOS.h"
-#include "engine/bp/BPFileWriter.h"
+#include "BPFileWriter.h"
// supported transports
#include "transport/file/FStream.h"
diff --git a/include/engine/bp/BPFileWriter.h b/source/engine/bp/BPFileWriter.h
similarity index 99%
rename from include/engine/bp/BPFileWriter.h
rename to source/engine/bp/BPFileWriter.h
index 74ae04ce8..6ab88afa7 100644
--- a/include/engine/bp/BPFileWriter.h
+++ b/source/engine/bp/BPFileWriter.h
@@ -11,8 +11,9 @@
#ifndef BPFILEWRITER_H_
#define BPFILEWRITER_H_
-#include "capsule/heap/STLVector.h"
#include "core/Engine.h"
+
+#include "capsule/heap/STLVector.h"
#include "utilities/format/bp1/BP1.h"
namespace adios
diff --git a/source/engine/dataman/DataManReader.cpp b/source/engine/dataman/DataManReader.cpp
index 4ad22bcb8..6a38f3606 100644
--- a/source/engine/dataman/DataManReader.cpp
+++ b/source/engine/dataman/DataManReader.cpp
@@ -8,7 +8,7 @@
* Author: wfg
*/
-#include "engine/dataman/DataManReader.h"
+#include "DataManReader.h"
#include "core/Support.h"
#include "external/json.hpp"
diff --git a/include/engine/dataman/DataManReader.h b/source/engine/dataman/DataManReader.h
similarity index 99%
rename from include/engine/dataman/DataManReader.h
rename to source/engine/dataman/DataManReader.h
index f29494f45..a74adcf64 100644
--- a/include/engine/dataman/DataManReader.h
+++ b/source/engine/dataman/DataManReader.h
@@ -15,12 +15,11 @@
#include "core/Engine.h"
#include "utilities/format/bp1/BP1Writer.h"
+#include "utilities/realtime/dataman/DataMan.h"
// supported capsules
#include "capsule/heap/STLVector.h"
-#include "utilities/realtime/dataman/DataMan.h"
-
namespace adios
{
diff --git a/source/engine/dataman/DataManWriter.cpp b/source/engine/dataman/DataManWriter.cpp
index 7e438b535..6e24b0117 100644
--- a/source/engine/dataman/DataManWriter.cpp
+++ b/source/engine/dataman/DataManWriter.cpp
@@ -10,7 +10,7 @@
#include <iostream> //needs to go away, this is just for demo purposes
-#include "engine/dataman/DataManWriter.h"
+#include "DataManWriter.h"
#include "core/Support.h"
#include "functions/adiosFunctions.h" //CSVToVector
diff --git a/include/engine/dataman/DataManWriter.h b/source/engine/dataman/DataManWriter.h
similarity index 99%
rename from include/engine/dataman/DataManWriter.h
rename to source/engine/dataman/DataManWriter.h
index 9902afb02..ba28a5861 100644
--- a/include/engine/dataman/DataManWriter.h
+++ b/source/engine/dataman/DataManWriter.h
@@ -16,12 +16,11 @@
#include "core/Engine.h"
#include "utilities/format/bp1/BP1Writer.h"
+#include "utilities/realtime/dataman/DataMan.h"
// supported capsules
#include "capsule/heap/STLVector.h"
-#include "utilities/realtime/dataman/DataMan.h"
-
namespace adios
{
diff --git a/source/engine/hdf5/HDF5ReaderP.cpp b/source/engine/hdf5/HDF5ReaderP.cpp
index 00ec0a8fb..5b706030e 100644
--- a/source/engine/hdf5/HDF5ReaderP.cpp
+++ b/source/engine/hdf5/HDF5ReaderP.cpp
@@ -2,7 +2,7 @@
* Distributed under the OSI-approved Apache License, Version 2.0. See
* accompanying file Copyright.txt for details.
*
- * HDF5WriterP.cpp
+ * HDF5ReaderP.cpp
*
* Created on: March 20, 2017
* Author: Junmin
@@ -10,4 +10,4 @@
#include <iostream> //needs to go away, this is just for demo purposes
-#include "engine/hdf5/HDF5ReaderP.h"
+#include "HDF5ReaderP.h"
diff --git a/include/engine/hdf5/HDF5ReaderP.h b/source/engine/hdf5/HDF5ReaderP.h
similarity index 100%
rename from include/engine/hdf5/HDF5ReaderP.h
rename to source/engine/hdf5/HDF5ReaderP.h
diff --git a/source/engine/hdf5/HDF5WriterP.cpp b/source/engine/hdf5/HDF5WriterP.cpp
index b75a447b4..7f0219108 100644
--- a/source/engine/hdf5/HDF5WriterP.cpp
+++ b/source/engine/hdf5/HDF5WriterP.cpp
@@ -10,7 +10,7 @@
#include <iostream> //needs to go away, this is just for demo purposes
-#include "engine/hdf5/HDF5WriterP.h"
+#include "HDF5WriterP.h"
#include "core/Support.h"
#include "functions/adiosFunctions.h" //CSVToVector
diff --git a/include/engine/hdf5/HDF5WriterP.h b/source/engine/hdf5/HDF5WriterP.h
similarity index 97%
rename from include/engine/hdf5/HDF5WriterP.h
rename to source/engine/hdf5/HDF5WriterP.h
index cbdbf1c7d..64fc6031c 100644
--- a/include/engine/hdf5/HDF5WriterP.h
+++ b/source/engine/hdf5/HDF5WriterP.h
@@ -91,8 +91,8 @@ public:
void Close(const int transportIndex = -1);
private:
- capsule::STLVector
- m_Buffer; ///< heap capsule, contains data and metadata buffers
+ ///< heap capsule, contains data and metadata buffers
+ capsule::STLVector m_Buffer;
void Init();
void clean();
diff --git a/source/transform/BZip2.cpp b/source/transform/BZip2.cpp
index d01bea9f8..d0991b3a4 100644
--- a/source/transform/BZip2.cpp
+++ b/source/transform/BZip2.cpp
@@ -8,7 +8,7 @@
* Author: wfg
*/
-#include "../../include/transform/BZip2.h"
+#include "BZip2.h"
namespace adios
{
diff --git a/include/transform/BZip2.h b/source/transform/BZip2.h
similarity index 100%
rename from include/transform/BZip2.h
rename to source/transform/BZip2.h
diff --git a/source/transport/file/FStream.cpp b/source/transport/file/FStream.cpp
index a813c67f2..69b603e63 100644
--- a/source/transport/file/FStream.cpp
+++ b/source/transport/file/FStream.cpp
@@ -13,7 +13,7 @@
#include <stdexcept>
/// \endcond
-#include "transport/file/FStream.h"
+#include "FStream.h"
namespace adios
{
diff --git a/include/transport/file/FStream.h b/source/transport/file/FStream.h
similarity index 100%
rename from include/transport/file/FStream.h
rename to source/transport/file/FStream.h
diff --git a/source/transport/file/FileDescriptor.cpp b/source/transport/file/FileDescriptor.cpp
index b71980c0f..29959987a 100644
--- a/source/transport/file/FileDescriptor.cpp
+++ b/source/transport/file/FileDescriptor.cpp
@@ -17,7 +17,7 @@
#include <unistd.h> // write, close
/// \endcond
-#include "transport/file/FileDescriptor.h"
+#include "FileDescriptor.h"
namespace adios
{
diff --git a/include/transport/file/FileDescriptor.h b/source/transport/file/FileDescriptor.h
similarity index 100%
rename from include/transport/file/FileDescriptor.h
rename to source/transport/file/FileDescriptor.h
diff --git a/source/transport/file/FilePointer.cpp b/source/transport/file/FilePointer.cpp
index 75effdf43..8348d80ea 100644
--- a/source/transport/file/FilePointer.cpp
+++ b/source/transport/file/FilePointer.cpp
@@ -12,7 +12,7 @@
#include <ios> //std::ios_base::failure
/// \endcond
-#include "transport/file/FilePointer.h"
+#include "FilePointer.h"
namespace adios
{
diff --git a/include/transport/file/FilePointer.h b/source/transport/file/FilePointer.h
similarity index 100%
rename from include/transport/file/FilePointer.h
rename to source/transport/file/FilePointer.h
diff --git a/include/transport/file/MPI_File.h b/source/transport/file/MPI_File.h
similarity index 97%
rename from include/transport/file/MPI_File.h
rename to source/transport/file/MPI_File.h
index 10685e8ce..445df8200 100644
--- a/include/transport/file/MPI_File.h
+++ b/source/transport/file/MPI_File.h
@@ -12,7 +12,7 @@
#define MPI_FILE_H_
/// \cond EXCLUDE_FROM_DOXYGEN
-#include <mpi.h>
+#include "ADIOS_MPI.h"
/// \endcond
namespace adios
diff --git a/source/transport/wan/MdtmMan.cpp b/source/transport/wan/MdtmMan.cpp
index c3fbdafd4..2394ed008 100644
--- a/source/transport/wan/MdtmMan.cpp
+++ b/source/transport/wan/MdtmMan.cpp
@@ -8,7 +8,7 @@
* Author: wfg
*/
-#include "transport/wan/MdtmMan.h"
+#include "MdtmMan.h"
namespace adios
{
diff --git a/include/transport/wan/MdtmMan.h b/source/transport/wan/MdtmMan.h
similarity index 100%
rename from include/transport/wan/MdtmMan.h
rename to source/transport/wan/MdtmMan.h
diff --git a/include/utilities/format/bp1/BP1.h b/source/utilities/format/bp1/BP1.h
similarity index 100%
rename from include/utilities/format/bp1/BP1.h
rename to source/utilities/format/bp1/BP1.h
diff --git a/source/utilities/format/bp1/BP1Aggregator.cpp b/source/utilities/format/bp1/BP1Aggregator.cpp
index 1ad2d00e7..7cb585ed8 100644
--- a/source/utilities/format/bp1/BP1Aggregator.cpp
+++ b/source/utilities/format/bp1/BP1Aggregator.cpp
@@ -9,7 +9,7 @@
*/
/// \cond EXCLUDE_FROM_DOXYGEN
-#include "utilities/format/bp1/BP1Aggregator.h"
+#include "BP1Aggregator.h"
#include <fstream>
#include <stdexcept>
diff --git a/include/utilities/format/bp1/BP1Aggregator.h b/source/utilities/format/bp1/BP1Aggregator.h
similarity index 100%
rename from include/utilities/format/bp1/BP1Aggregator.h
rename to source/utilities/format/bp1/BP1Aggregator.h
diff --git a/source/utilities/format/bp1/BP1Base.cpp b/source/utilities/format/bp1/BP1Base.cpp
index 9c4472457..506298eb6 100644
--- a/source/utilities/format/bp1/BP1Base.cpp
+++ b/source/utilities/format/bp1/BP1Base.cpp
@@ -8,7 +8,7 @@
* Author: wfg
*/
-#include "utilities/format/bp1/BP1Base.h"
+#include "BP1Base.h"
#include "functions/adiosFunctions.h"
namespace adios
diff --git a/include/utilities/format/bp1/BP1Base.h b/source/utilities/format/bp1/BP1Base.h
similarity index 100%
rename from include/utilities/format/bp1/BP1Base.h
rename to source/utilities/format/bp1/BP1Base.h
diff --git a/include/utilities/format/bp1/BP1Structs.h b/source/utilities/format/bp1/BP1Structs.h
similarity index 100%
rename from include/utilities/format/bp1/BP1Structs.h
rename to source/utilities/format/bp1/BP1Structs.h
diff --git a/source/utilities/format/bp1/BP1Writer.cpp b/source/utilities/format/bp1/BP1Writer.cpp
index 69145b946..12b3139a4 100644
--- a/source/utilities/format/bp1/BP1Writer.cpp
+++ b/source/utilities/format/bp1/BP1Writer.cpp
@@ -13,8 +13,8 @@
#include <vector>
/// \endcond
+#include "BP1Writer.h"
#include "BP1Writer.tcc"
-#include "utilities/format/bp1/BP1Writer.h"
namespace adios
{
diff --git a/include/utilities/format/bp1/BP1Writer.h b/source/utilities/format/bp1/BP1Writer.h
similarity index 100%
rename from include/utilities/format/bp1/BP1Writer.h
rename to source/utilities/format/bp1/BP1Writer.h
diff --git a/source/utilities/format/bp1/BP1Writer.tcc b/source/utilities/format/bp1/BP1Writer.tcc
index d516af9dc..bab7bb9c8 100644
--- a/source/utilities/format/bp1/BP1Writer.tcc
+++ b/source/utilities/format/bp1/BP1Writer.tcc
@@ -10,7 +10,7 @@
#ifndef BP1WRITER_TCC_
#define BP1WRITER_TCC_
-#include "utilities/format/bp1/BP1Writer.h"
+#include "BP1Writer.h"
namespace adios
{
diff --git a/source/utilities/realtime/dataman/DataMan.cpp b/source/utilities/realtime/dataman/DataMan.cpp
index eedda8a3a..84bad36c9 100644
--- a/source/utilities/realtime/dataman/DataMan.cpp
+++ b/source/utilities/realtime/dataman/DataMan.cpp
@@ -8,7 +8,7 @@
* Author: Jason Wang
*/
-#include "utilities/realtime/dataman/DataMan.h"
+#include "DataMan.h"
namespace adios
{
diff --git a/include/utilities/realtime/dataman/DataMan.h b/source/utilities/realtime/dataman/DataMan.h
similarity index 100%
rename from include/utilities/realtime/dataman/DataMan.h
rename to source/utilities/realtime/dataman/DataMan.h
diff --git a/source/utilities/realtime/dataman/DataManBase.cpp b/source/utilities/realtime/dataman/DataManBase.cpp
index 5081eba05..c2f8ca611 100644
--- a/source/utilities/realtime/dataman/DataManBase.cpp
+++ b/source/utilities/realtime/dataman/DataManBase.cpp
@@ -8,7 +8,7 @@
* Author: Jason Wang
*/
-#include "utilities/realtime/dataman/DataManBase.h"
+#include "DataManBase.h"
namespace adios
{
diff --git a/include/utilities/realtime/dataman/DataManBase.h b/source/utilities/realtime/dataman/DataManBase.h
similarity index 100%
rename from include/utilities/realtime/dataman/DataManBase.h
rename to source/utilities/realtime/dataman/DataManBase.h
--
GitLab