From fa093967eccaee80acd663d95bacc1063f1abe60 Mon Sep 17 00:00:00 2001
From: dc-dc-dc <dgcruz983@gmail.com>
Date: Fri, 22 Dec 2023 16:05:07 -0500
Subject: [PATCH] moved to subdirectory

---
 mlx/CMakeLists.txt          | 4 +---
 mlx/backend/common/load.cpp | 2 +-
 mlx/io/CMakeLists.txt       | 6 ++++++
 mlx/{ => io}/load.cpp       | 2 +-
 mlx/{ => io}/load.h         | 0
 mlx/{ => io}/safetensor.cpp | 2 +-
 mlx/{ => io}/safetensor.h   | 2 +-
 mlx/mlx.h                   | 1 -
 mlx/ops.h                   | 2 +-
 mlx/primitives.h            | 2 +-
 python/src/load.cpp         | 2 +-
 11 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 mlx/io/CMakeLists.txt
 rename mlx/{ => io}/load.cpp (99%)
 rename mlx/{ => io}/load.h (100%)
 rename mlx/{ => io}/safetensor.cpp (99%)
 rename mlx/{ => io}/safetensor.h (95%)

diff --git a/mlx/CMakeLists.txt b/mlx/CMakeLists.txt
index e7e708bd4..aa1232e10 100644
--- a/mlx/CMakeLists.txt
+++ b/mlx/CMakeLists.txt
@@ -8,10 +8,8 @@ target_sources(
   ${CMAKE_CURRENT_SOURCE_DIR}/fft.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/ops.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/graph_utils.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/load.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/primitives.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/random.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/safetensor.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/scheduler.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/transforms.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/utils.cpp
@@ -19,7 +17,7 @@ target_sources(
 )
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/backend/common)
-
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/io)
 if (MLX_BUILD_ACCELERATE) 
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/backend/accelerate)
 else()
diff --git a/mlx/backend/common/load.cpp b/mlx/backend/common/load.cpp
index e68ce7f6f..6cf8ffe53 100644
--- a/mlx/backend/common/load.cpp
+++ b/mlx/backend/common/load.cpp
@@ -5,7 +5,7 @@
 #include <utility>
 
 #include "mlx/allocator.h"
-#include "mlx/load.h"
+#include "mlx/io/load.h"
 #include "mlx/primitives.h"
 
 namespace mlx::core {
diff --git a/mlx/io/CMakeLists.txt b/mlx/io/CMakeLists.txt
new file mode 100644
index 000000000..f3e27b96a
--- /dev/null
+++ b/mlx/io/CMakeLists.txt
@@ -0,0 +1,6 @@
+target_sources(
+  mlx
+  PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}/load.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/safetensor.cpp
+)
diff --git a/mlx/load.cpp b/mlx/io/load.cpp
similarity index 99%
rename from mlx/load.cpp
rename to mlx/io/load.cpp
index 8106448a4..856cf17a2 100644
--- a/mlx/load.cpp
+++ b/mlx/io/load.cpp
@@ -6,7 +6,7 @@
 #include <limits>
 #include <sstream>
 
-#include "mlx/load.h"
+#include "mlx/io/load.h"
 #include "mlx/ops.h"
 #include "mlx/primitives.h"
 #include "mlx/utils.h"
diff --git a/mlx/load.h b/mlx/io/load.h
similarity index 100%
rename from mlx/load.h
rename to mlx/io/load.h
diff --git a/mlx/safetensor.cpp b/mlx/io/safetensor.cpp
similarity index 99%
rename from mlx/safetensor.cpp
rename to mlx/io/safetensor.cpp
index b198454e0..10092df6b 100644
--- a/mlx/safetensor.cpp
+++ b/mlx/io/safetensor.cpp
@@ -1,4 +1,4 @@
-#include "mlx/safetensor.h"
+#include "mlx/io/safetensor.h"
 
 #include <stack>
 
diff --git a/mlx/safetensor.h b/mlx/io/safetensor.h
similarity index 95%
rename from mlx/safetensor.h
rename to mlx/io/safetensor.h
index 6bec469d3..104a226ce 100644
--- a/mlx/safetensor.h
+++ b/mlx/io/safetensor.h
@@ -4,7 +4,7 @@
 
 #include <json.hpp>
 
-#include "mlx/load.h"
+#include "mlx/io/load.h"
 #include "mlx/ops.h"
 #include "mlx/primitives.h"
 
diff --git a/mlx/mlx.h b/mlx/mlx.h
index c67684ab2..102d2dde9 100644
--- a/mlx/mlx.h
+++ b/mlx/mlx.h
@@ -8,7 +8,6 @@
 #include "mlx/fft.h"
 #include "mlx/ops.h"
 #include "mlx/random.h"
-#include "mlx/safetensor.h"
 #include "mlx/stream.h"
 #include "mlx/transforms.h"
 #include "mlx/utils.h"
diff --git a/mlx/ops.h b/mlx/ops.h
index f8737d83c..b228d4114 100644
--- a/mlx/ops.h
+++ b/mlx/ops.h
@@ -7,7 +7,7 @@
 
 #include "array.h"
 #include "device.h"
-#include "load.h"
+#include "io/load.h"
 #include "stream.h"
 
 namespace mlx::core {
diff --git a/mlx/primitives.h b/mlx/primitives.h
index 0cb98c9c7..747b26c10 100644
--- a/mlx/primitives.h
+++ b/mlx/primitives.h
@@ -4,7 +4,7 @@
 
 #include "array.h"
 #include "device.h"
-#include "load.h"
+#include "io/load.h"
 #include "stream.h"
 
 #define DEFINE_GRADS()                           \
diff --git a/python/src/load.cpp b/python/src/load.cpp
index 18157dfc0..78bdbac35 100644
--- a/python/src/load.cpp
+++ b/python/src/load.cpp
@@ -10,7 +10,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "mlx/load.h"
+#include "mlx/io/load.h"
 #include "mlx/ops.h"
 #include "mlx/utils.h"
 #include "python/src/load.h"