headers are now included with their library prefix

core/include/aare/core/CircularFifo.hpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <thread>
 
-#include "aare/ProducerConsumerQueue.hpp"
+#include "aare/core/ProducerConsumerQueue.hpp"
 
 namespace aare {
 

core/include/aare/core/Frame.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include "aare/NDArray.hpp"
+#include "aare/core/NDArray.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 #include <cstddef>
 #include <cstdint>
 #include <memory>

core/include/aare/core/NDArray.hpp

@@ -7,7 +7,7 @@ memory.
 TODO! Add expression templates for operators
 
 */
-#include "aare/NDView.hpp"
+#include "aare/core/NDView.hpp"
 
 #include <algorithm>
 #include <array>

core/include/aare/core/VariableSizeClusterFinder.hpp

@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "aare/NDArray.hpp"
+#include "aare/core/NDArray.hpp"
 
 const int MAX_CLUSTER_SIZE = 200;
 namespace aare {

core/src/DType.cpp

@@ -1,5 +1,5 @@
 
-#include "aare/DType.hpp"
+#include "aare/core/DType.hpp"
 #include <fmt/format.h>
 
 namespace aare {

core/src/Frame.cpp

@@ -1,4 +1,4 @@
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/utils/logger.hpp"
 #include <cassert>
 #include <iostream>

core/src/defs.cpp

@@ -1,4 +1,4 @@
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 
 namespace aare {
 

core/test/CircularFifo.test.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch_all.hpp>
 
-#include "aare/CircularFifo.hpp"
+#include "aare/core/CircularFifo.hpp"
 
 using aare::CircularFifo;
 

core/test/DType.test.cpp

@@ -1,6 +1,6 @@
 
 
-#include "aare/DType.hpp"
+#include "aare/core/DType.hpp"
 #include <catch2/catch_test_macros.hpp>
 
 using aare::DType;

core/test/Frame.test.cpp

@@ -1,4 +1,4 @@
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include <catch2/catch_test_macros.hpp>
 
 using aare::Frame;

core/test/NDArray.test.cpp

@@ -1,4 +1,4 @@
-#include "aare/NDArray.hpp"
+#include "aare/core/NDArray.hpp"
 #include <array>
 #include <catch2/catch_test_macros.hpp>
 

core/test/NDView.test.cpp

@@ -1,4 +1,4 @@
-#include "aare/NDView.hpp"
+#include "aare/core/NDView.hpp"
 #include <catch2/catch_test_macros.hpp>
 
 #include <iostream>

core/test/ProducerConsumerQueue.test.cpp

@@ -1,4 +1,4 @@
-#include "aare/ProducerConsumerQueue.hpp"
+#include "aare/core/ProducerConsumerQueue.hpp"
 #include <catch2/catch_all.hpp>
 
 // using arve::SimpleQueue;

core/test/defs.test.cpp

@@ -1,4 +1,4 @@
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <string>
 TEST_CASE("Enum to string conversion") {

core/test/wrappers.test.cpp

@@ -1,5 +1,5 @@
-#include <aare/Frame.hpp>
+#include <aare/core/Frame.hpp>
-#include <aare/NDView.hpp>
+#include <aare/core/NDView.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <cstdint>
 

examples/json_example.cpp

@@ -1,5 +1,5 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include "aare/utils/logger.hpp"
 #include <iostream>
 

examples/multiport_example.cpp

@@ -1,5 +1,5 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include "aare/utils/logger.hpp"
 #include <iostream>
 

examples/mythen_example.cpp

@@ -1,5 +1,5 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include "aare/utils/logger.hpp"
 #include <iostream>
 

examples/numpy_read_example.cpp

@@ -1,5 +1,5 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include <iostream>
 
 #define AARE_ROOT_DIR_VAR "PROJECT_ROOT_DIR"

examples/numpy_write_example.cpp

@@ -1,6 +1,6 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include <iostream>
 
 #define AARE_ROOT_DIR_VAR "PROJECT_ROOT_DIR"

examples/raw_example.cpp

@@ -1,5 +1,5 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include "aare/utils/logger.hpp"
 #include <iostream>
 

examples/restream_example.cpp

@@ -0,0 +1,10 @@
+#include "aare/network_io/ZmqSocketSender.hpp"
+#include "aare/
+
+using namespace aare;
+using namespace std;
+
+int main(){
+
+
+}

examples/zmq_sender_example.cpp

@@ -1,4 +1,4 @@
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/network_io/ZmqHeader.hpp"
 #include "aare/network_io/ZmqSocketSender.hpp"
 #include "aare/network_io/defs.hpp"

file_io/include/aare/file_io/File.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "aare/FileInterface.hpp"
+#include "aare/file_io/FileInterface.hpp"
 
 namespace aare {
 class File {

file_io/include/aare/file_io/FileFactory.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include "aare/DType.hpp"
+#include "aare/core/DType.hpp"
-#include "aare/FileInterface.hpp"
+#include "aare/file_io/FileInterface.hpp"
 #include "aare/utils/logger.hpp"
 #include <filesystem>
 

file_io/include/aare/file_io/FileInterface.hpp

@@ -1,7 +1,7 @@
 #pragma once
-#include "aare/DType.hpp"
+#include "aare/core/DType.hpp"
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 #include "aare/utils/logger.hpp"
 #include <filesystem>
 #include <vector>

file_io/include/aare/file_io/NumpyFile.hpp

@@ -1,8 +1,8 @@
 #pragma once
-#include "aare/DType.hpp"
+#include "aare/core/DType.hpp"
-#include "aare/FileInterface.hpp"
+#include "aare/file_io/FileInterface.hpp"
-#include "aare/NumpyHelpers.hpp"
+#include "aare/file_io/NumpyHelpers.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 #include <filesystem>
 #include <iostream>
 #include <numeric>

file_io/include/aare/file_io/NumpyFileFactory.hpp

@@ -1,7 +1,7 @@
 #pragma once
-#include "aare/FileFactory.hpp"
+#include "aare/file_io/FileFactory.hpp"
-#include "aare/NumpyFile.hpp"
+#include "aare/file_io/NumpyFile.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 #include <fstream>
 
 namespace aare {

file_io/include/aare/file_io/NumpyHelpers.hpp

@@ -11,8 +11,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "aare/DType.hpp"
+#include "aare/core/DType.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 
 namespace aare {
 

file_io/include/aare/file_io/RawFile.hpp

@@ -1,8 +1,8 @@
 #pragma once
-#include "aare/FileInterface.hpp"
+#include "aare/file_io/FileInterface.hpp"
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
-#include "aare/SubFile.hpp"
+#include "aare/file_io/SubFile.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 
 namespace aare {
 

file_io/include/aare/file_io/RawFileFactory.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include "aare/FileFactory.hpp"
+#include "aare/file_io/FileFactory.hpp"
-#include "aare/RawFile.hpp"
+#include "aare/file_io/RawFile.hpp"
 
 namespace aare {
 

file_io/include/aare/file_io/SubFile.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 #include <cstdint>
 #include <filesystem>
 #include <map>

file_io/include/aare/file_io/helpers.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "aare/FileInterface.hpp"
+#include "aare/file_io/FileInterface.hpp"
 #include <filesystem>
 #include <fmt/core.h>
 

file_io/src/File.cpp

@@ -1,5 +1,5 @@
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
-#include "aare/FileFactory.hpp"
+#include "aare/file_io/FileFactory.hpp"
 #include "aare/utils/logger.hpp"
 
 namespace aare {

file_io/src/FileFactory.cpp

@@ -1,7 +1,7 @@
-#include "aare/FileFactory.hpp"
+#include "aare/file_io/FileFactory.hpp"
-#include "aare/FileInterface.hpp"
+#include "aare/file_io/FileInterface.hpp"
-#include "aare/NumpyFileFactory.hpp"
+#include "aare/file_io/NumpyFileFactory.hpp"
-#include "aare/RawFileFactory.hpp"
+#include "aare/file_io/RawFileFactory.hpp"
 #include "aare/utils/logger.hpp"
 #include <iostream>
 

file_io/src/NumpyFile.cpp

@@ -1,5 +1,5 @@
 
-#include "aare/NumpyFile.hpp"
+#include "aare/file_io/NumpyFile.hpp"
 
 namespace aare {
 

file_io/src/NumpyFileFactory.cpp

@@ -1,5 +1,5 @@
-#include "aare/NumpyFileFactory.hpp"
+#include "aare/file_io/NumpyFileFactory.hpp"
-#include "aare/NumpyHelpers.hpp"
+#include "aare/file_io/NumpyHelpers.hpp"
 
 namespace aare {
 

file_io/src/NumpyHelpers.cpp

@@ -22,7 +22,7 @@
    SOFTWARE.
 */
 
-#include "aare/NumpyHelpers.hpp"
+#include "aare/file_io/NumpyHelpers.hpp"
 #include <iterator>
 
 namespace aare {

file_io/src/RawFile.cpp

@@ -1,4 +1,4 @@
-#include "aare/RawFile.hpp"
+#include "aare/file_io/RawFile.hpp"
 #include "aare/utils/logger.hpp"
 
 namespace aare {

file_io/src/RawFileFactory.cpp

@@ -1,8 +1,8 @@
-#include "aare/RawFileFactory.hpp"
+#include "aare/file_io/RawFileFactory.hpp"
-#include "aare/RawFile.hpp"
+#include "aare/file_io/RawFile.hpp"
-#include "aare/SubFile.hpp"
+#include "aare/file_io/SubFile.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
-#include "aare/helpers.hpp"
+#include "aare/file_io/helpers.hpp"
 #include "aare/utils/logger.hpp"
 
 #include <fstream>

file_io/src/SubFile.cpp

@@ -1,4 +1,4 @@
-#include "aare/SubFile.hpp"
+#include "aare/file_io/SubFile.hpp"
 #include "aare/utils/logger.hpp"
 #include <cstring> // memcpy
 #include <fmt/core.h>

file_io/src/helpers.cpp

@@ -1,4 +1,4 @@
-#include "aare/helpers.hpp"
+#include "aare/file_io/helpers.hpp"
 
 namespace aare {
 

file_io/test/NumpyFile.test.cpp

@@ -1,5 +1,5 @@
-#include "aare/NumpyFile.hpp"
+#include "aare/file_io/NumpyFile.hpp"
-#include "aare/NDArray.hpp"
+#include "aare/core/NDArray.hpp"
 #include <catch2/catch_test_macros.hpp>
 
 #include "test_config.hpp"

file_io/test/NumpyHelpers.test.cpp

@@ -1,4 +1,4 @@
-#include "aare/NumpyHelpers.hpp" //Is this really a public header?
+#include "aare/file_io/NumpyHelpers.hpp" //Is this really a public header?
 #include <catch2/catch_test_macros.hpp>
 
 using namespace aare::NumpyHelpers;

file_io/test/RawFile.test.cpp

@@ -1,4 +1,4 @@
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include "aare/utils/logger.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <filesystem>

network_io/include/aare/network_io/ZmqHeader.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/utils/logger.hpp"
 
 #include "simdjson.h"

network_io/include/aare/network_io/ZmqSocketReceiver.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/network_io/ZmqHeader.hpp"
 #include "aare/network_io/ZmqSocket.hpp"
 #include "aare/network_io/defs.hpp"

network_io/include/aare/network_io/ZmqSocketSender.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/network_io/ZmqHeader.hpp"
 #include "aare/network_io/ZmqSocket.hpp"
 #include "aare/network_io/defs.hpp"

network_io/include/aare/network_io/defs.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/network_io/ZmqHeader.hpp"
 
 #include <stdexcept>

python/src/bindings.cpp

@@ -5,8 +5,8 @@
 #include <string>
 
 #include "aare/FileHandler.hpp"
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 
 namespace py = pybind11;