Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 2fbec60

Browse files
eric-haibin-linEC2 Default UserLin
authored
graph executor c api removal (#18598)
* add default ctx to cachedop fwd * add test * perl fix * initial commit * update sparse tests * add aux_states * fix aux-state type * fix some tests * fix check symbolic forwrad/backward * fix symbolic grad check * arg_dict fixes * support init ops * support forward only graph * fix check symbolic backward stype * add missing file * replace extension test bind * replace bind with _bind * simplify backward_mul implementation * small fix * drop contrib.sparseembedding * remove simple_bind in test sparse ops * use simple_bind * replave simple bind in quantization * fix aux index * update amp simple_bind calls * drop ifft * fix a bug found in subgraph op * add aux_array method * replace symbols * minor fix * fix executor default context * fix import * bug fix for nd.where * add subgraph test * fix forward grad req * fix batch dot dtype * remove unused code * fix slice dtype * fix attach grad * remove tests for non-existing sparse ops * MXCachedOpGetOptimizedSymbol * fix foreach test * enhance err msg * skip failed test * add docs * add docs * fix lint * fix lint, remove quantization * fix lint * fix lint * fix lint * fix build and import * fix import * remove scala, R, julia, perl bindings * remove cpp, matlab bindings * fix perl call * fix test * remove perl binding * remove reshape test * fix profiler, trt * remove tensorrt test * remove quantization tests * fix import * fix conflcit * fix lint * skip buggy test * remove clojure * remove executor c api * remove amalgamation * fix build * move executor folder * fix import * fix lint * fix cpp pcakge * fix predict cpp * fix cpp make * remove jnilint * remove cpp package tset * remove julia test pipeline * disable numpy tests * disable compat test for delete Co-authored-by: EC2 Default User <[email protected]> Co-authored-by: Lin <[email protected]>
1 parent c1098aa commit 2fbec60

File tree

719 files changed

+141
-99737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

719 files changed

+141
-99737
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -898,19 +898,11 @@ if(INSTALL_PYTHON_VERSIONS)
898898
endforeach()
899899
endif()
900900

901-
if(USE_CPP_PACKAGE)
902-
add_subdirectory(cpp-package)
903-
target_compile_definitions(mxnet PUBLIC MXNET_USE_CPP_PACKAGE=1)
904-
if(BUILD_CPP_EXAMPLES)
905-
add_subdirectory(example/image-classification/predict-cpp)
906-
endif()
907-
endif()
908-
909901
add_subdirectory(tests)
910902

911903
# ---[ Linter target
912904
find_package(Python3)
913-
set(LINT_DIRS "include src plugin cpp-package tests")
905+
set(LINT_DIRS "include src plugin tests")
914906
set(EXCLUDE_PATH "src/operator/contrib/ctc_include")
915907
add_custom_target(mxnet_lint COMMAND ${CMAKE_COMMAND} -DMSVC=${MSVC} -DPYTHON_EXECUTABLE=${Python3_EXECUTABLE} -DLINT_DIRS=${LINT_DIRS} -DPROJECT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DPROJECT_NAME=mxnet -DEXCLUDE_PATH=${EXCLUDE_PATH} -P ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dmlc-core/cmake/lint.cmake)
916908

‎Makefile‎

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ ifndef DLPACK_PATH
4848
DLPACK_PATH = $(ROOTDIR)/3rdparty/dlpack
4949
endif
5050

51-
ifndef AMALGAMATION_PATH
52-
AMALGAMATION_PATH = $(ROOTDIR)/amalgamation
53-
endif
54-
5551
ifndef TVM_PATH
5652
TVM_PATH = $(TPARTYDIR)/tvm
5753
endif
@@ -463,7 +459,7 @@ ifeq ($(USE_DIST_KVSTORE), 1)
463459
LDFLAGS += $(PS_LDFLAGS_A)
464460
endif
465461

466-
.PHONY: clean all extra-packages test lint clean_all rcpplint rcppexport roxygen\
462+
.PHONY: clean all extra-packages test lint clean_all roxygen\
467463
cython3 cython cyclean
468464

469465
all: lib/libmxnet.a lib/libmxnet.so $(BIN) extra-packages extension_libs
@@ -663,23 +659,17 @@ $(BIN) :
663659
@mkdir -p $(@D)
664660
$(CXX) $(CFLAGS) -std=c++17 -o $@ $(filter %.cpp %.o %.c %.a %.cc, $^) $(LDFLAGS)
665661

666-
# CPP Package
667-
ifeq ($(USE_CPP_PACKAGE), 1)
668-
include cpp-package/cpp-package.mk
669-
CFLAGS += -DMXNET_USE_CPP_PACKAGE=1
670-
endif
671-
672662
include mkldnn.mk
673663
include tests/cpp/unittest.mk
674664

675665
extra-packages: $(EXTRA_PACKAGES)
676666

677667
test: $(TEST)
678668

679-
lint: cpplint rcpplint jnilint pylint
669+
lint: cpplint pylint
680670

681671
cpplint:
682-
3rdparty/dmlc-core/scripts/lint.py mxnet cpp include src plugin cpp-package tests \
672+
3rdparty/dmlc-core/scripts/lint.py mxnet cpp include src plugin tests \
683673
--exclude_path src/operator/contrib/ctc_include include/mkldnn
684674

685675
pylint:
@@ -727,28 +717,6 @@ cython3:
727717
cyclean:
728718
rm -rf python/mxnet/*/*.so python/mxnet/*/*.cpp
729719

730-
scalaclean:
731-
(cd $(ROOTDIR)/scala-package && mvn clean)
732-
733-
scalapkg:
734-
(cd $(ROOTDIR)/scala-package && mvn install -DskipTests)
735-
736-
scalainstall:
737-
(cd $(ROOTDIR)/scala-package && mvn install)
738-
739-
scalaunittest:
740-
(cd $(ROOTDIR)/scala-package && mvn install)
741-
742-
scalaintegrationtest:
743-
(cd $(ROOTDIR)/scala-package && mvn integration-test -DskipTests=false)
744-
745-
jnilint:
746-
3rdparty/dmlc-core/scripts/lint.py mxnet-jnicpp cpp scala-package/native/src --exclude_path scala-package/native/src/main/native/org_apache_mxnet_native_c_api.h
747-
748-
rclean:
749-
$(RM) -r R-package/src/image_recordio.h R-package/NAMESPACE R-package/man R-package/R/mxnet_generated.R \
750-
R-package/inst R-package/src/*.o R-package/src/*.so mxnet_*.tar.gz
751-
752720
build/rat/apache-rat-0.13/apache-rat-0.13.jar:
753721
mkdir -p build/rat
754722
cd build/rat; \
@@ -770,25 +738,23 @@ ratcheck: build/rat/apache-rat-0.13/apache-rat-0.13.jar
770738

771739

772740
ifneq ($(EXTRA_OPERATORS),)
773-
clean: rclean cyclean $(EXTRA_PACKAGES_CLEAN)
741+
clean: cyclean $(EXTRA_PACKAGES_CLEAN)
774742
$(RM) -r build lib bin deps *~ */*~ */*/*~ */*/*/*~
775743
(cd scala-package && mvn clean) || true
776744
cd $(DMLC_CORE); $(MAKE) clean; cd -
777745
cd $(PS_PATH); $(MAKE) clean; cd -
778746
cd $(NNVM_PATH); $(MAKE) clean; cd -
779747
cd $(TVM_PATH); $(MAKE) clean; cd -
780-
cd $(AMALGAMATION_PATH); $(MAKE) clean; cd -
781748
$(RM) -r $(patsubst %, %/*.d, $(EXTRA_OPERATORS)) $(patsubst %, %/*/*.d, $(EXTRA_OPERATORS))
782749
$(RM) -r $(patsubst %, %/*.o, $(EXTRA_OPERATORS)) $(patsubst %, %/*/*.o, $(EXTRA_OPERATORS))
783750
else
784-
clean: rclean mkldnn_clean cyclean testclean $(EXTRA_PACKAGES_CLEAN)
751+
clean: mkldnn_clean cyclean testclean $(EXTRA_PACKAGES_CLEAN)
785752
$(RM) -r build lib bin *~ */*~ */*/*~ */*/*/*~
786753
(cd scala-package && mvn clean) || true
787754
cd $(DMLC_CORE); $(MAKE) clean; cd -
788755
cd $(PS_PATH); $(MAKE) clean; cd -
789756
cd $(NNVM_PATH); $(MAKE) clean; cd -
790757
cd $(TVM_PATH); $(MAKE) clean; cd -
791-
cd $(AMALGAMATION_PATH); $(MAKE) clean; cd -
792758
endif
793759

794760
clean_all: clean

‎R-package/.Rbuildignore‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎R-package/.gitignore‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎R-package/DESCRIPTION‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎R-package/LICENSE‎

Lines changed: 0 additions & 202 deletions
This file was deleted.

0 commit comments

Comments
 (0)