diff options
Diffstat (limited to 'misc/mxnet/files')
| -rw-r--r-- | misc/mxnet/files/patch-CMakeLists.txt | 46 | ||||
| -rw-r--r-- | misc/mxnet/files/patch-src_operator_numpy_np__einsum__op-inl.h | 44 |
2 files changed, 0 insertions, 90 deletions
diff --git a/misc/mxnet/files/patch-CMakeLists.txt b/misc/mxnet/files/patch-CMakeLists.txt deleted file mode 100644 index bc3fb3a0fefa..000000000000 --- a/misc/mxnet/files/patch-CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ ---- CMakeLists.txt.orig 2021-11-04 20:30:01 UTC -+++ CMakeLists.txt -@@ -7,7 +7,7 @@ if(CMAKE_CROSSCOMPILING) - endif() - - project(mxnet C CXX) --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 14) # workaround for https://github.com/apache/incubator-mxnet/issues/20784 - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS ON) - -@@ -511,6 +511,7 @@ if(USE_JEMALLOC) - endif() - endif() - -+if (ENABLE_TESTING) - include(CTest) - set(GTEST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/googletest/googletest") - set(GTEST_INCLUDE_DIR ${GTEST_ROOT}/include) -@@ -521,6 +522,7 @@ set(GTEST_LIBRARY gtest) - - add_subdirectory(${GTEST_ROOT}) - find_package(GTest REQUIRED) -+endif() - - # cudnn detection - if(USE_CUDNN) -@@ -974,7 +976,7 @@ install(TARGETS ${MXNET_INSTALL_TARGETS} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dlpack/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dmlc-core/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+#install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dmlc-core/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/mshadow/mshadow/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mshadow) - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/mxnet/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mxnet) - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/tvm/nnvm/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -@@ -1020,7 +1022,9 @@ if(USE_CPP_PACKAGE) - endif() - endif() - -+if(ENABLE_TESTING) - add_subdirectory(tests) -+endif() - - # ---[ Linter target - if(MSVC) diff --git a/misc/mxnet/files/patch-src_operator_numpy_np__einsum__op-inl.h b/misc/mxnet/files/patch-src_operator_numpy_np__einsum__op-inl.h deleted file mode 100644 index 94ca65d86e2f..000000000000 --- a/misc/mxnet/files/patch-src_operator_numpy_np__einsum__op-inl.h +++ /dev/null @@ -1,44 +0,0 @@ -https://github.com/apache/incubator-mxnet/issues/17076 - ---- src/operator/numpy/np_einsum_op-inl.h.orig 2019-12-15 04:21:16 UTC -+++ src/operator/numpy/np_einsum_op-inl.h -@@ -701,7 +701,7 @@ inline void NumpyEinsumProcess(const std::vector<TBlob - rstride_arr, - nop, - -1, -- reinterpret_cast<DType*>(NULL)); -+ (DType*)nullptr); - }) - }) - }) -@@ -947,7 +947,7 @@ inline void NumpyEinsumBackward(const OpStatePtr& stat - if (handle_out) { - temp_inputs.push_back(inputs[0]); - } else { -- temp_inputs.push_back(TBlob(reinterpret_cast<DType*>(NULL), -+ temp_inputs.push_back(TBlob((DType*)nullptr, - paths[i].oshape, - xpu::kDevMask)); - } -@@ -958,10 +958,10 @@ inline void NumpyEinsumBackward(const OpStatePtr& stat - temp_outputs.push_back(outputs[idx - 1]); - temp_req.push_back(req[idx - 1]); - } else { -- temp_inputs.push_back(TBlob(reinterpret_cast<DType*>(NULL), -+ temp_inputs.push_back(TBlob((DType*)nullptr, - paths[-idx].oshape, - xpu::kDevMask)); -- temp_outputs.push_back(TBlob(reinterpret_cast<DType*>(NULL), -+ temp_outputs.push_back(TBlob((DType*)nullptr, - paths[-idx].oshape, - xpu::kDevMask)); - temp_req.push_back(OpReqType::kWriteTo); -@@ -973,7 +973,7 @@ inline void NumpyEinsumBackward(const OpStatePtr& stat - cur_tensordot_tempspace_size = - TensordotBackwardWorkspaceSize<xpu>(paths[i].left_pos, - paths[i].right_pos, -- TBlob(reinterpret_cast<DType*>(NULL), -+ TBlob((DType*)nullptr, - paths[i].tshape, - xpu::kDevMask), - temp_inputs[1], |