Revert "Dynamic Library Loading Support (#15489)"

This reverts commit 3112893.
apache · Aug 5, 2019 · 1e97b86 · 1e97b86
1 parent 3112893
commit 1e97b86
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 533 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -701,7 +701,6 @@ if(UNIX)
   add_library(mxnet SHARED ${DUMMY_SOURCE})
   target_link_libraries(mxnet PRIVATE ${BEGIN_WHOLE_ARCHIVE} $<TARGET_FILE:mxnet_static> ${END_WHOLE_ARCHIVE})
   target_link_libraries(mxnet PRIVATE mxnet_static)
-  target_link_libraries(mxnet_static PUBLIC ${CMAKE_DL_LIBS})
   set_target_properties(mxnet_static PROPERTIES OUTPUT_NAME mxnet)
 else()
   add_library(mxnet SHARED ${SOURCE})

diff --git a/Makefile b/Makefile
@@ -107,7 +107,7 @@ else
 	CFLAGS += -O3 -DNDEBUG=1
 endif
 CFLAGS += -I$(TPARTYDIR)/mshadow/ -I$(TPARTYDIR)/dmlc-core/include -fPIC -I$(NNVM_PATH)/include -I$(DLPACK_PATH)/include -I$(TPARTYDIR)/tvm/include -Iinclude $(MSHADOW_CFLAGS)
-LDFLAGS = -pthread -ldl $(MSHADOW_LDFLAGS) $(DMLC_LDFLAGS)
+LDFLAGS = -pthread $(MSHADOW_LDFLAGS) $(DMLC_LDFLAGS)
 
 ifeq ($(ENABLE_TESTCOVERAGE), 1)
         CFLAGS += --coverage

diff --git a/example/lib_api/Makefile b/example/lib_api/Makefile
diff --git a/example/lib_api/libtest.cc b/example/lib_api/libtest.cc
diff --git a/example/lib_api/mylib.cc b/example/lib_api/mylib.cc
diff --git a/example/lib_api/test.py b/example/lib_api/test.py
diff --git a/include/mxnet/c_api.h b/include/mxnet/c_api.h
@@ -226,13 +226,6 @@ MXNET_DLL const char *MXGetLastError();
 // Part 0: Global State setups
 //-------------------------------------
 
-/*!
- * \brief Load library dynamically
- * \param path to the library .so file
- * \return 0 when success, -1 when failure happens.
- */
-MXNET_DLL int MXLoadLib(const char *path);
-
 /*!
  * \brief Get list of features supported on the runtime
  * \param libFeature pointer to array of LibFeature

diff --git a/include/mxnet/lib_api.h b/include/mxnet/lib_api.h
diff --git a/python/mxnet/__init__.py b/python/mxnet/__init__.py
@@ -26,7 +26,6 @@
 from .base import MXNetError
 from .util import is_np_shape, set_np_shape, np_shape, use_np_shape
 from . import base
-from . import library
 from . import contrib
 from . import ndarray
 from . import ndarray as nd

diff --git a/python/mxnet/base.py b/python/mxnet/base.py
@@ -86,7 +86,7 @@ def __repr__(self):
 
 
 class MXNetError(Exception):
-    """Error that will be thrown by all mxnet functions."""
+    """Error that will be throwed by all mxnet functions."""
     pass
 
 

diff --git a/python/mxnet/library.py b/python/mxnet/library.py
diff --git a/src/c_api/c_api.cc b/src/c_api/c_api.cc
@@ -45,13 +45,11 @@
 #include "mxnet/storage.h"
 #include "mxnet/libinfo.h"
 #include "mxnet/imperative.h"
-#include "mxnet/lib_api.h"
 #include "./c_api_common.h"
 #include "../operator/custom/custom-inl.h"
 #include "../operator/tensor/matrix_op-inl.h"
 #include "../operator/tvmop/op_module.h"
 #include "../common/utils.h"
-#include "../common/library.h"
 
 using namespace mxnet;
 
@@ -92,19 +90,6 @@ inline int MXAPIGetFunctionRegInfo(const FunRegType *e,
 
 // NOTE: return value is added in API_END
 
-// Loads library and initializes it
-int MXLoadLib(const char *path) {
-  API_BEGIN();
-  void *lib = load_lib(path);
-  if (!lib)
-    LOG(FATAL) << "Unable to load library";
-
-  initialize_t initialize = get_func<initialize_t>(lib, const_cast<char*>(MXLIB_INITIALIZE_STR));
-  if (!initialize(static_cast<int>(MXNET_VERSION)))
-    LOG(FATAL) << "Library failed to initialize";
-  API_END();
-}
-
 int MXLibInfoFeatures(const struct LibFeature **lib_features, size_t *size) {
   using namespace features;
   API_BEGIN();