Merge pull request #262 from jrhemstad/fea-ext-move-device-resource-f…

…older Moved device memory resource files to mr/device folder
rapidsai · Feb 3, 2020 · c3acb47 · c3acb47
2 parents 47cb6b8 + 640c379
commit c3acb47
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - PR #252 Add `__sizeof__` method to `DeviceBuffer`
 - PR #258 Define pickling behavior for `DeviceBuffer`
 - PR #261 Add `__bytes__` method to `DeviceBuffer`
+- PR #262 Moved device memory resource files to `mr/device` directory
 - PR #266 Drop `rmm.auto_device`
 
 ## Improvements

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -112,7 +112,7 @@ add_library(rmm SHARED
             src/device_buffer.cpp
             src/memory_manager.cpp
             thirdparty/cnmem/src/cnmem.cpp
-            src/mr/default_memory_resource.cpp)
+            src/mr/device/default_memory_resource.cpp)
 
 # override rpath for rmm
 SET_TARGET_PROPERTIES(rmm PROPERTIES BUILD_RPATH "\$ORIGIN")

diff --git a/include/rmm/detail/memory_manager.hpp b/include/rmm/detail/memory_manager.hpp
@@ -31,7 +31,7 @@
 #include <set>
 #include <mutex>
 
-#include <rmm/mr/device_memory_resource.hpp>
+#include <rmm/mr/device/device_memory_resource.hpp>
 
 #include <rmm/rmm_api.h>
 #include <rmm/detail/cnmem.h>

diff --git a/include/rmm/device_buffer.hpp b/include/rmm/device_buffer.hpp
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <rmm/mr/default_memory_resource.hpp>
-#include <rmm/mr/device_memory_resource.hpp>
+#include <rmm/mr/device/default_memory_resource.hpp>
+#include <rmm/mr/device/device_memory_resource.hpp>
 
 #include <cuda_runtime_api.h>
 #include <cassert>

diff --git a/include/rmm/device_scalar.hpp b/include/rmm/device_scalar.hpp
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <rmm/device_buffer.hpp>
-#include <rmm/mr/default_memory_resource.hpp>
-#include <rmm/mr/device_memory_resource.hpp>
+#include <rmm/mr/device/default_memory_resource.hpp>
+#include <rmm/mr/device/device_memory_resource.hpp>
 
 namespace rmm {
 

diff --git a/.../rmm/mr/cnmem_managed_memory_resource.hpp → .../device/cnmem_managed_memory_resource.hpp b/.../rmm/mr/cnmem_managed_memory_resource.hpp → .../device/cnmem_managed_memory_resource.hpp
diff --git a/include/rmm/mr/cnmem_memory_resource.hpp → ...e/rmm/mr/device/cnmem_memory_resource.hpp b/include/rmm/mr/cnmem_memory_resource.hpp → ...e/rmm/mr/device/cnmem_memory_resource.hpp
diff --git a/include/rmm/mr/cuda_memory_resource.hpp → ...de/rmm/mr/device/cuda_memory_resource.hpp b/include/rmm/mr/cuda_memory_resource.hpp → ...de/rmm/mr/device/cuda_memory_resource.hpp
diff --git a/include/rmm/mr/default_memory_resource.hpp → ...rmm/mr/device/default_memory_resource.hpp b/include/rmm/mr/default_memory_resource.hpp → ...rmm/mr/device/default_memory_resource.hpp
diff --git a/include/rmm/mr/device_memory_resource.hpp → .../rmm/mr/device/device_memory_resource.hpp b/include/rmm/mr/device_memory_resource.hpp → .../rmm/mr/device/device_memory_resource.hpp
diff --git a/include/rmm/mr/managed_memory_resource.hpp → ...rmm/mr/device/managed_memory_resource.hpp b/include/rmm/mr/managed_memory_resource.hpp → ...rmm/mr/device/managed_memory_resource.hpp
diff --git a/include/rmm/mr/thrust_allocator_adaptor.hpp → ...mm/mr/device/thrust_allocator_adaptor.hpp b/include/rmm/mr/thrust_allocator_adaptor.hpp → ...mm/mr/device/thrust_allocator_adaptor.hpp
diff --git a/include/rmm/rmm.hpp b/include/rmm/rmm.hpp
@@ -24,7 +24,7 @@
 #define MEMORY_HPP
 #include "rmm/rmm_api.h"
 #include "rmm/detail/memory_manager.hpp"
-#include "rmm/mr/default_memory_resource.hpp"
+#include "rmm/mr/device/default_memory_resource.hpp"
 
 /** ---------------------------------------------------------------------------*
  * @brief Macro wrapper to check for error in RMM API calls.

diff --git a/src/memory_manager.cpp b/src/memory_manager.cpp
@@ -15,11 +15,11 @@
  */
 
 #include <rmm/detail/memory_manager.hpp>
-#include <rmm/mr/cnmem_managed_memory_resource.hpp>
-#include <rmm/mr/cnmem_memory_resource.hpp>
-#include <rmm/mr/cuda_memory_resource.hpp>
-#include <rmm/mr/default_memory_resource.hpp>
-#include <rmm/mr/managed_memory_resource.hpp>
+#include <rmm/mr/device/cnmem_managed_memory_resource.hpp>
+#include <rmm/mr/device/cnmem_memory_resource.hpp>
+#include <rmm/mr/device/cuda_memory_resource.hpp>
+#include <rmm/mr/device/default_memory_resource.hpp>
+#include <rmm/mr/device/managed_memory_resource.hpp>
 
 namespace rmm {
 /** -------------------------------------------------------------------------*

diff --git a/src/mr/default_memory_resource.cpp → src/mr/device/default_memory_resource.cpp b/src/mr/default_memory_resource.cpp → src/mr/device/default_memory_resource.cpp
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <rmm/mr/cnmem_managed_memory_resource.hpp>
-#include <rmm/mr/cnmem_memory_resource.hpp>
-#include <rmm/mr/cuda_memory_resource.hpp>
-#include <rmm/mr/default_memory_resource.hpp>
-#include <rmm/mr/device_memory_resource.hpp>
-#include <rmm/mr/managed_memory_resource.hpp>
+#include <rmm/mr/device/cnmem_managed_memory_resource.hpp>
+#include <rmm/mr/device/cnmem_memory_resource.hpp>
+#include <rmm/mr/device/cuda_memory_resource.hpp>
+#include <rmm/mr/device/default_memory_resource.hpp>
+#include <rmm/mr/device/device_memory_resource.hpp>
+#include <rmm/mr/device/managed_memory_resource.hpp>
 
 #include <atomic>
 

diff --git a/src/rmm.cpp b/src/rmm.cpp
@@ -23,10 +23,10 @@
 
 #include "rmm/rmm.h"
 #include "rmm/detail/memory_manager.hpp"
-#include "rmm/mr/cnmem_memory_resource.hpp"
-#include "rmm/mr/cnmem_managed_memory_resource.hpp"
-#include "rmm/mr/managed_memory_resource.hpp"
-#include "rmm/mr/cuda_memory_resource.hpp"
+#include "rmm/mr/device/cnmem_memory_resource.hpp"
+#include "rmm/mr/device/cnmem_managed_memory_resource.hpp"
+#include "rmm/mr/device/managed_memory_resource.hpp"
+#include "rmm/mr/device/cuda_memory_resource.hpp"
 
 
 

diff --git a/tests/device_buffer_tests.cpp b/tests/device_buffer_tests.cpp
@@ -17,12 +17,12 @@
 #include "gtest/gtest.h"
 
 #include <rmm/device_buffer.hpp>
-#include <rmm/mr/cnmem_memory_resource.hpp>
-#include <rmm/mr/cnmem_managed_memory_resource.hpp>
-#include <rmm/mr/cuda_memory_resource.hpp>
-#include <rmm/mr/default_memory_resource.hpp>
-#include <rmm/mr/device_memory_resource.hpp>
-#include <rmm/mr/managed_memory_resource.hpp>
+#include <rmm/mr/device/cnmem_memory_resource.hpp>
+#include <rmm/mr/device/cnmem_managed_memory_resource.hpp>
+#include <rmm/mr/device/cuda_memory_resource.hpp>
+#include <rmm/mr/device/default_memory_resource.hpp>
+#include <rmm/mr/device/device_memory_resource.hpp>
+#include <rmm/mr/device/managed_memory_resource.hpp>
 
 #include <cuda_runtime_api.h>
 #include <cstddef>

diff --git a/tests/device_scalar_tests.cpp b/tests/device_scalar_tests.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include <rmm/device_scalar.hpp>
-#include <rmm/mr/default_memory_resource.hpp>
-#include <rmm/mr/device_memory_resource.hpp>
+#include <rmm/mr/device/default_memory_resource.hpp>
+#include <rmm/mr/device/device_memory_resource.hpp>
 
 #include <cuda_runtime_api.h>
 #include <chrono>

diff --git a/tests/mr/mr_tests.cpp b/tests/mr/mr_tests.cpp
@@ -16,12 +16,12 @@
 
 #include "gtest/gtest.h"
 
-#include <rmm/mr/cnmem_memory_resource.hpp>
-#include <rmm/mr/cnmem_managed_memory_resource.hpp>
-#include <rmm/mr/cuda_memory_resource.hpp>
-#include <rmm/mr/default_memory_resource.hpp>
-#include <rmm/mr/device_memory_resource.hpp>
-#include <rmm/mr/managed_memory_resource.hpp>
+#include <rmm/mr/device/cnmem_memory_resource.hpp>
+#include <rmm/mr/device/cnmem_managed_memory_resource.hpp>
+#include <rmm/mr/device/cuda_memory_resource.hpp>
+#include <rmm/mr/device/default_memory_resource.hpp>
+#include <rmm/mr/device/device_memory_resource.hpp>
+#include <rmm/mr/device/managed_memory_resource.hpp>
 
 #include <cuda_runtime_api.h>
 #include <cstddef>

diff --git a/tests/mr/thrust_allocator_tests.cpp b/tests/mr/thrust_allocator_tests.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <rmm/mr/cnmem_memory_resource.hpp>
-#include <rmm/mr/cnmem_managed_memory_resource.hpp>
-#include <rmm/mr/cuda_memory_resource.hpp>
-#include <rmm/mr/default_memory_resource.hpp>
-#include <rmm/mr/device_memory_resource.hpp>
-#include <rmm/mr/managed_memory_resource.hpp>
-#include <rmm/mr/thrust_allocator_adaptor.hpp>
+#include <rmm/mr/device/cnmem_memory_resource.hpp>
+#include <rmm/mr/device/cnmem_managed_memory_resource.hpp>
+#include <rmm/mr/device/cuda_memory_resource.hpp>
+#include <rmm/mr/device/default_memory_resource.hpp>
+#include <rmm/mr/device/device_memory_resource.hpp>
+#include <rmm/mr/device/managed_memory_resource.hpp>
+#include <rmm/mr/device/thrust_allocator_adaptor.hpp>
 
 #include <gtest/gtest.h>