You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/11/01 22:59:02 UTC
[GitHub] hetong007 closed pull request #12998: remove legacy installation of
Roxygen2 5.0 and add R-specific clean target (#12993)
hetong007 closed pull request #12998: remove legacy installation of Roxygen2 5.0 and add R-specific clean target (#12993)
URL: https://github.com/apache/incubator-mxnet/pull/12998
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Makefile b/Makefile
index 620679a44f8..b1231173664 100644
--- a/Makefile
+++ b/Makefile
@@ -584,14 +584,15 @@ rpkg:
cp -rf 3rdparty/tvm/nnvm/include/* R-package/inst/include
Rscript -e "if(!require(devtools)){install.packages('devtools', repo = 'https://cloud.r-project.org/')}"
Rscript -e "library(devtools); library(methods); options(repos=c(CRAN='https://cloud.r-project.org/')); install_deps(pkg='R-package', dependencies = TRUE)"
- echo "import(Rcpp)" > R-package/NAMESPACE
- echo "import(methods)" >> R-package/NAMESPACE
+ cp R-package/dummy.NAMESPACE R-package/NAMESPACE
+ echo "import(Rcpp)" >> R-package/NAMESPACE
R CMD INSTALL R-package
- Rscript -e "require(mxnet); mxnet:::mxnet.export('R-package')"
- Rscript -e "if (!require('roxygen2')||packageVersion('roxygen2')!= '5.0.1'){\
- devtools::install_version('roxygen2',version='5.0.1',\
- repo='https://cloud.r-project.org/',quiet=TRUE)}"
- Rscript -e "require(roxygen2); roxygen2::roxygenise('R-package')"
+ Rscript -e "if (!require('roxygen2')||packageVersion('roxygen2') < '5.0.1'){\
+ devtools::install_version('roxygen2',version='5.0.1',\
+ repos='https://cloud.r-project.org/',quiet=TRUE)}"
+ Rscript -e "require(mxnet); mxnet:::mxnet.export('R-package'); warnings()"
+ rm R-package/NAMESPACE
+ Rscript -e "require(roxygen2); roxygen2::roxygenise('R-package'); warnings()"
R CMD INSTALL R-package
rpkgtest:
@@ -657,10 +658,13 @@ scaladeploy:
jnilint:
3rdparty/dmlc-core/scripts/lint.py mxnet-jnicpp cpp scala-package/native/src
-ifneq ($(EXTRA_OPERATORS),)
-clean: cyclean $(EXTRA_PACKAGES_CLEAN)
- $(RM) -r build lib bin *~ */*~ */*/*~ */*/*/*~ R-package/NAMESPACE R-package/man R-package/R/mxnet_generated.R \
+rclean:
+ $(RM) -r R-package/src/image_recordio.h R-package/NAMESPACE R-package/man R-package/R/mxnet_generated.R \
R-package/inst R-package/src/*.o R-package/src/*.so mxnet_*.tar.gz
+
+ifneq ($(EXTRA_OPERATORS),)
+clean: rclean cyclean $(EXTRA_PACKAGES_CLEAN)
+ $(RM) -r build lib bin *~ */*~ */*/*~ */*/*/*~
cd $(DMLC_CORE); $(MAKE) clean; cd -
cd $(PS_PATH); $(MAKE) clean; cd -
cd $(NNVM_PATH); $(MAKE) clean; cd -
@@ -668,9 +672,8 @@ clean: cyclean $(EXTRA_PACKAGES_CLEAN)
$(RM) -r $(patsubst %, %/*.d, $(EXTRA_OPERATORS)) $(patsubst %, %/*/*.d, $(EXTRA_OPERATORS))
$(RM) -r $(patsubst %, %/*.o, $(EXTRA_OPERATORS)) $(patsubst %, %/*/*.o, $(EXTRA_OPERATORS))
else
-clean: mkldnn_clean cyclean testclean $(EXTRA_PACKAGES_CLEAN)
- $(RM) -r build lib bin *~ */*~ */*/*~ */*/*/*~ R-package/NAMESPACE R-package/man R-package/R/mxnet_generated.R \
- R-package/inst R-package/src/image_recordio.h R-package/src/*.o R-package/src/*.so mxnet_*.tar.gz
+clean: rclean mkldnn_clean cyclean testclean $(EXTRA_PACKAGES_CLEAN)
+ $(RM) -r build lib bin *~ */*~ */*/*~ */*/*/*~
cd $(DMLC_CORE); $(MAKE) clean; cd -
cd $(PS_PATH); $(MAKE) clean; cd -
cd $(NNVM_PATH); $(MAKE) clean; cd -
diff --git a/R-package/.Rbuildignore b/R-package/.Rbuildignore
index 423105a7932..d0da835e2c0 100644
--- a/R-package/.Rbuildignore
+++ b/R-package/.Rbuildignore
@@ -3,5 +3,6 @@ src/*.so$
\.dll$
^.*\.Rproj$
^\.Rproj\.user$
+dummy.NAMESPACE
README.md
diff --git a/R-package/DESCRIPTION b/R-package/DESCRIPTION
index 0990c63e027..244219b9ee8 100644
--- a/R-package/DESCRIPTION
+++ b/R-package/DESCRIPTION
@@ -32,4 +32,4 @@ Depends:
R (>= 3.3.0)
LinkingTo: Rcpp
VignetteBuilder: knitr
-RoxygenNote: 5.0.1
+RoxygenNote: 6.1.0
diff --git a/R-package/R/zzz.R b/R-package/R/zzz.R
index 6c63081af59..db7573ab255 100644
--- a/R-package/R/zzz.R
+++ b/R-package/R/zzz.R
@@ -34,8 +34,8 @@ NULL
.onLoad <- function(libname, pkgname) {
# Require methods for older versions of R
require(methods)
- library.dynam("libmxnet", pkgname, libname, local=FALSE)
- library.dynam("mxnet", pkgname, libname)
+ tryCatch(library.dynam("libmxnet", pkgname, libname, local=FALSE), error = function(e) { print('Loading local: inst/libs/libmxnet.so'); dyn.load("R-package/inst/libs/libmxnet.so", local=FALSE) })
+ tryCatch(library.dynam("mxnet", pkgname, libname), error = function(e) { print('Loading local: src/mxnet.so'); dyn.load("R-package/src/mxnet.so") })
loadModule("mxnet", TRUE)
init.symbol.methods()
init.context.default()
diff --git a/R-package/dummy.NAMESPACE b/R-package/dummy.NAMESPACE
new file mode 100644
index 00000000000..6225fbf702e
--- /dev/null
+++ b/R-package/dummy.NAMESPACE
@@ -0,0 +1,16 @@
+# Generated by roxygen2: do not edit by hand
+
+import(Rcpp)
+import(methods)
+importFrom(DiagrammeR,add_global_graph_attrs)
+importFrom(DiagrammeR,create_edge_df)
+importFrom(DiagrammeR,create_graph)
+importFrom(DiagrammeR,create_node_df)
+importFrom(DiagrammeR,render_graph)
+importFrom(jsonlite,fromJSON)
+importFrom(magrittr,"%>%")
+importFrom(stringr,str_extract_all)
+importFrom(stringr,str_replace_all)
+importFrom(stringr,str_replace_na)
+importFrom(stringr,str_trim)
+importFrom(visNetwork,visHierarchicalLayout)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services