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

Bumped minor version from 1.4.0 to 1.5.0 on master, updated License file #13478

Merged
merged 29 commits into from
Dec 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2cb8faf
updated to v1.5.0
srochel Nov 30, 2018
e4af8e7
Bumped minor version from 1.4.0 to 1.5.0 on master
srochel Nov 30, 2018
49bbcbc
added Anirudh as maintainer for R package
srochel Dec 2, 2018
42c6db0
Updated license file for clojure, onnx-tensorrt, gtest, R-package
srochel Dec 2, 2018
408a55d
Get the correct include path in pip package (#13452)
apeforest Nov 30, 2018
7b67d8f
Use ~/.ccache as default ccache directory so is not cache is not eras…
larroy Nov 30, 2018
f9e661e
Skip flaky test https://github.com/apache/incubator-mxnet/issues/1344…
ChaiBapchya Nov 30, 2018
b902878
Rewrite dataloader with process pool, improves responsiveness and rel…
zhreshold Nov 30, 2018
819a04a
Fix errors in docstrings for subgraph op; use code directive (#13463)
aaronmarkham Nov 30, 2018
ddf6980
[MXNET-1158] JVM Memory Management Documentation (#13105)
nswamy Nov 30, 2018
4d342ef
Update row_sparse tutorial (#13414)
eric-haibin-lin Nov 30, 2018
fb92a66
Add resiliency to onnx export code (#13426)
safrooze Nov 30, 2018
0bb26ac
[MXNET-1185] Support large array in several operators (part 1) (#13418)
apeforest Dec 1, 2018
aed3079
[MXNET-1210 ] Gluon Audio - Example (#13325)
gaurav-gireesh Dec 1, 2018
c9ddcb8
ONNX export: Instance normalization, Shape (#12920)
vandanavk Dec 1, 2018
9e74dfa
Clarify dependency on OpenCV in CNN Visualization tutorial. (#13495)
vishaalkapoor Dec 1, 2018
049107c
clarify ops faq regarding docs strings (#13492)
aaronmarkham Dec 1, 2018
80e2a1d
Add graph_compact operator. (#13436)
zheng-da Dec 1, 2018
1fd7558
Deprecate Jenkinsfile (#13474)
marcoabreu Dec 1, 2018
d8029c8
update github location for sampled_block.py (#13508)
srochel Dec 2, 2018
96f5beb
#13453 [Clojure] - Add Spec Validations to the Optimizer namespace (#…
hellonico Dec 2, 2018
09b6607
ONNX export: Logical operators (#12852)
vandanavk Dec 3, 2018
dd9d80c
Fix cmake options parsing in dev_menu (#13458)
larroy Dec 3, 2018
b901d52
Revert "Manually track num_max_thread (#12380)" (#13501)
anirudh2290 Dec 3, 2018
c44bc85
Feature/mkldnn static 2 (#13503)
azai91 Dec 3, 2018
41f3f98
fix toctree Sphinx errors (#13489)
aaronmarkham Dec 4, 2018
e533304
Disabled flaky test test_gluon_data.test_recordimage_dataset_with_dat…
jlcontreras Dec 4, 2018
7f3a591
[MXNET-1234] Fix shape inference problems in Activation backward (#13…
larroy Dec 4, 2018
a8e635d
Merge branch 'master' into master
srochel Dec 5, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ if(USE_MKLDNN)
include(cmake/DownloadMKLML.cmake)
# CPU architecture (e.g., C5) can't run on another architecture (e.g., g3).
if(NOT MSVC)
set(MKLDNN_LIBRARY_TYPE "STATIC" CACHE INTERNAL "" FORCE)
set(ARCH_OPT_FLAGS "-mtune=generic")
else()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /EHsc")
Expand Down
94 changes: 88 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,20 @@
1. MXNet Cpp-package - For details, /cpp-package/LICENSE
2. MXNet rcnn - For details, see, example/rcnn/LICENSE
3. scala-package - For details, see, scala-package/LICENSE
4. Warp-CTC - For details, see, src/operator/contrib/ctc_include/LICENSE
4. Warp-CTC - For details, see, 3rdparty/ctc_include/LICENSE
5. 3rdparty/dlpack - For details, see, 3rdparty/dlpack/LICENSE
6. 3rdparty/dmlc-core - For details, see, 3rdparty/dmlc-core/LICENSE
7. 3rdparty/mshadow - For details, see, 3rdparty/mshadow/LICENSE
8. 3rdparty/tvm - For details, see, 3rdparty/tvm/LICENSE
9. 3rdparty/tvm/dmlc-core - For details, see, 3rdparty/tvm/dmlc-core/LICENSE
10. 3rdparty/tvm/nnvm - For details, see, 3rdparty/tvm/nnvm/LICENSE
11. 3rdparty/ps-lite - For details, see, 3rdparty/ps-lite/LICENSE
12. 3rdparty/mkldnn - For details, see, 3rdparty/mkldnn/LICENSE
13. googlemock scripts/generator - For details, see, 3rdparty/googletest/googlemock/scripts/generator/LICENSE
10. 3rdparty/tvm/dlpack - For details, see, 3rdparty/tvm/3rdparty/dlpack/LICENSE
11. 3rdparty/tvm/nnvm - For details, see, 3rdparty/tvm/nnvm/LICENSE
12. 3rdparty/ps-lite - For details, see, 3rdparty/ps-lite/LICENSE
13. 3rdparty/mkldnn - For details, see, 3rdparty/mkldnn/LICENSE
14. googlemock scripts/generator - For details, see, 3rdparty/googletest/googlemock/scripts/generator/LICENSE
15. clojure-package - For details, see, contrib/clojure-package/LICENSE
16. R-package - For details, see, R-package/LICENSE
17. ONNX-TensorRT benchmark package - For details, see, 3rdparty/onnx-tensorrt/third_party/onnx/third_party/benchmark/LICENSE


=======================================================================================
Expand All @@ -239,14 +243,17 @@
3. tree_lstm - For details, see example/gluon/tree_lstm/LICENSE
4. OpenMP - For details, see 3rdparty/openmp/LICENSE.txt
5. HalideIR - For details, see nnvm/tvm/HalideIR/LICENSE
6. HalideIR - For details, see 3rdparty/tvm/3rdparty/HalideIR/LICENSE
7. ONNX-TensorRT - For details, see 3rdparty/onnx-tensorrt/LICENSE
8. ONNX-TensorRT - For details, see 3rdparty/onnx-tensorrt/third_party/onnx/LICENSE


=======================================================================================
NVIDIA Licenses
=======================================================================================

1. Moderngpu
For details, see, src/operator/contrib/ctc_include/contrib/moderngpu/LICENSE
For details, see, 3rdparty/ctc_include/contrib/moderngpu/LICENSE

/******************************************************************************
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -559,4 +566,79 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=======================================================================================

12. Google tests
For details, ses, 3rdparty/mkldnn/tests/gtests/gtest/LICENSE

Copyright 2008, Google Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=======================================================================================

13. ONNX python bindings
For details, see, 3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/LICENSE

Copyright (c) 2016 Wenzel Jakob <[email protected]>, All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

You are under no obligation whatsoever to provide any bug fixes, patches, or
upgrades to the features, functionality or performance of the source code
("Enhancements") to anyone; however, if you choose to make your Enhancements
available either publicly, or directly to the author of this software, without
imposing a separate written license agreement for such Enhancements, then you
hereby grant the following license: a non-exclusive, royalty-free perpetual
license to install, use, modify, prepare derivative works, incorporate into
other computer software, distribute, and sublicense such enhancements or
derivative works thereof, in binary and source code form.

9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,13 @@ ifeq ($(USE_MKLDNN), 1)
CFLAGS += -I$(MKLROOT)/include
LDFLAGS += -L$(MKLROOT)/lib
endif
CFLAGS += -I$(MKLDNNROOT)/include
LDFLAGS += -L$(MKLDNNROOT)/lib -lmkldnn -Wl,-rpath,'$${ORIGIN}'
# MKLDNN but to needs to be dynamically linked for windows as not all VS compilers support static linking
ifneq ($(UNAME_S), Windows)
LIB_DEP += $(MKLDNNROOT)/lib/libmkldnn.a
else
CFLAGS += -I$(MKLDNNROOT)/include
LDFLAGS += -L$(MKLDNNROOT)/lib -lmkldnn -Wl,-rpath,'$${ORIGIN}'
endif
endif

# setup opencv
Expand Down
10 changes: 5 additions & 5 deletions R-package/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Package: mxnet
Type: Package
Title: MXNet: A Flexible and Efficient Machine Learning Library for Heterogeneous Distributed Systems
Version: 1.4.0
Version: 1.5.0
Date: 2017-06-27
Author: Tianqi Chen, Qiang Kou, Tong He
Maintainer: Qiang Kou <[email protected]>
Repository: DMLC
Maintainer: Qiang Kou <[email protected]>, anirudhacharya <https://github.com/anirudhacharya>
Repository: Apache
Description: MXNet is a deep learning framework designed for both efficiency
and flexibility. It allows you to mix the flavours of deep learning programs
together to maximize the efficiency and your productivity.
License: Apache License (== 2.0)
URL: https://github.com/dmlc/mxnet/tree/master/R-package
BugReports: https://github.com/dmlc/mxnet/issues
URL: https://github.com/apache/incubator-mxnet/tree/master/R-package
BugReports: https://github.com/apache/incubator-mxnet/issues
Imports:
methods,
Rcpp (>= 0.12.1),
Expand Down
3 changes: 0 additions & 3 deletions ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -629,9 +629,6 @@ build_ubuntu_gpu_cmake_mkldnn() {
/work/mxnet

ninja -v
# libmkldnn.so.0 is a link file. We need an actual binary file named libmkldnn.so.0.
cp 3rdparty/mkldnn/src/libmkldnn.so.0 3rdparty/mkldnn/src/libmkldnn.so.0.tmp
mv 3rdparty/mkldnn/src/libmkldnn.so.0.tmp 3rdparty/mkldnn/src/libmkldnn.so.0
}

build_ubuntu_gpu_cmake() {
Expand Down
8 changes: 4 additions & 4 deletions ci/jenkins/Jenkins_steps.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
utils = load('ci/Jenkinsfile_utils.groovy')

// mxnet libraries
mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libiomp5.so, lib/libmklml_intel.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'

// Python wheels
mx_pip = 'build/*.whl'

// for scala build, need to pass extra libs when run with dist_kvstore
mx_dist_lib = 'lib/libmxnet.so, lib/libmxnet.a, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a'
mx_dist_lib = 'lib/libmxnet.so, lib/libmxnet.a, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a, lib/libmkldnn.a'
// mxnet cmake libraries, in cmake builds we do not produce a libnvvm static library by default.
mx_cmake_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
// mxnet cmake libraries, in cmake builds we do not produce a libnvvm static library by default.
mx_cmake_lib_debug = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests'
mx_cmake_mkldnn_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so, build/3rdparty/mkldnn/src/libmkldnn.so.0'
mx_mkldnn_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libiomp5.so, lib/libmkldnn.so.0, lib/libmklml_intel.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
mx_cmake_mkldnn_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
mx_mkldnn_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libiomp5.so, lib/libmklml_intel.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
mx_tensorrt_lib = 'lib/libmxnet.so, lib/libnvonnxparser_runtime.so.0, lib/libnvonnxparser.so.0, lib/libonnx_proto.so, lib/libonnx.so'
mx_lib_cpp_examples = 'lib/libmxnet.so, lib/libmxnet.a, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a, build/cpp-package/example/*'
mx_lib_cpp_examples_cpu = 'build/libmxnet.so, build/cpp-package/example/*'
Expand Down
16 changes: 8 additions & 8 deletions contrib/clojure-package/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ brew install opencv
- Create a new project with `lein new my-mxnet`
- Edit your `project.clj` and add one of the following entries to `:dependencies`, based on your system and the compute device you want to use:

- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-cpu "1.4.0"]`
- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-gpu "1.4.0"]`
- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-osx-cpu "1.4.0"]`
- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-cpu "1.5.0"]`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should actually be the version deployed on maven which will always be a release behind. Sorry for not catching it earlier - see #13507 for details.

In this case it should be 1.4.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only the CPU version or cpu, gpu and macos version need to be 1.4.0?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all the versions osx cpu, linux cpu, and linux gpu need to be the latest version out on maven https://search.maven.org/search?q=clojure%20mxnet at the time this PR gets merged. That timing is the thing I don't well understand. I am making an assumption at the time of the merge there will be a 1.4.0 release done and the jars will be out there.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is increasing the version on master to differentiate between v1.4.x branch. I would like to merge the PR asap, so we don't have same version on master and v1.4.x branch. v1.4.0 will become the first release on v1.4.x branch. If everything goes to plan, the release should be done before Xmas. The latest tag is now 1.3.1. Should all references point to this tag?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes - thanks for the clarification :)

- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-gpu "1.5.0"]`
- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-osx-cpu "1.5.0"]`

After making this change and running `lein deps`, you should be able to run example code like this [NDArray Tutorial](https://github.com/apache/incubator-mxnet/blob/master/contrib/clojure-package/examples/tutorial/src/tutorial/ndarray.clj).

Expand All @@ -116,20 +116,20 @@ After making this change and running `lein deps`, you should be able to run exam
With this option, you will install a Git revision of the Clojure package source and a [Scala package jar from Maven](https://search.maven.org/search?q=g:org.apache.mxnet) with native dependencies baked in.

- Install additional dependencies as described in [the corresponding section for Option 1](#installing-additional-dependencies),
- Recursively clone the MXNet repository and checkout the desired revision. Here we assume the `1.4.0` tag and a clone into the `~/mxnet` directory:
- Recursively clone the MXNet repository and checkout the desired revision. Here we assume the `1.5.0` tag and a clone into the `~/mxnet` directory:

```bash
git clone --recursive https://github.com/apache/incubator-mxnet.git ~/mxnet
cd ~/mxnet
git tag --list # Find the tag that matches the Scala package version
git checkout tags/1.4.0 -b my_mxnet
git checkout tags/1.5.0 -b my_mxnet
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be 1.4.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neither 1.4.0 nor 1.5.0 tag exists. Why would you want to check out a different version?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see answer below..

git submodule update --init --recursive
cd contrib/clojure
```

- Edit `project.clj` to include the desired Scala jar from Maven:

[org.apache.mxnet/mxnet-full_2.11-linux-x86_64-cpu "1.4.0”]
[org.apache.mxnet/mxnet-full_2.11-linux-x86_64-cpu "1.5.0”]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be 1.4.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this point to the latest released version, i.e. 1.3.0 today and 1.3.1 after the patch is released? Or should it point to nightly build?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should point to the latest release on maven for the clojure jars. It would be great for the users if we can reliable tell that at the time of the merge, but if this process gets to be too confusing we can always reword it to stay explicitly that it should be the latest release https://search.maven.org/search?q=clojure%20mxnet - Let me know your thoughts.


- Run `lein test`. All the tests should run without error.
- At this point you can run `lein install` to build and install the Clojure jar locally.
Expand All @@ -147,7 +147,7 @@ The first step is to recursively clone the MXNet repository and checkout the des
```bash
git clone --recursive https://github.com/apache/incubator-mxnet.git ~/mxnet
cd ~/mxnet
git checkout tags/1.4.0 -b my_mxnet # this is optional
git checkout tags/1.5.0 -b my_mxnet # this is optional
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be 1.4.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neither 1.4.0 nor 1.5.0 tag exists. 1.4.0 tag will point to a release in v1.4.x branch. Which should be the correct tag? Should it point to a release tag?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should point to the tag that corresponds to the jar on maven and the jars on maven are only for the last release. I'm assuming that it will be the 1.4.0 tag when this branch is merged (at least that's what I've been doing). For reference when I do git tag --list I see:

1.3.1
1.3.1.rc0

I'm not exactly sure of the timing of when this PR is merged though .. is that a correct assumption?

git submodule update --init --recursive
```

Expand Down Expand Up @@ -176,7 +176,7 @@ The outcome of this step will be a shared library `lib/libmxnet.so` that is used

#### Building the Clojure jar

- Enter the `contrib/clojure` directory and edit the `project.clj` file. Add the Scala jar that was just created and installed, e.g., `[org.apache.mxnet/mxnet-full_2.11-osx-x86_64-cpu "1.4.0-SNAPSHOT"]`, to the `:dependencies`.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is ok as we are building it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a build from v1.4.x or master branch?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is from master (building from scratch)

- Enter the `contrib/clojure` directory and edit the `project.clj` file. Add the Scala jar that was just created and installed, e.g., `[org.apache.mxnet/mxnet-full_2.11-osx-x86_64-cpu "1.5.0-SNAPSHOT"]`, to the `:dependencies`.
- Run `lein test`. All the tests should run without an error.
- Run `lein install` to build and install the Clojure jar locally.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
:description "CNN text classification with MXNet"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]]
:pedantic? :skip
:main cnn-text-classification.classifier)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/gan/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
:description "GAN MNIST with MXNet"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]
[nu.pattern/opencv "2.4.9-7"]]
:main gan.gan-mnist)
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
:description "Clojure examples for image classification"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]]
:pedantic? :skip
:main imclassification.train-mnist)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/module/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
:description "Clojure examples for module"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]]
:pedantic? :skip
:main mnist-mlp)

2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/multi-label/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
:description "Example of multi-label classification"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]]
:main multi-label.core)
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
:description "Neural Style Transfer with MXNet"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]
[net.mikera/imagez "0.12.0"]
[thinktopic/think.image "0.4.16"]]
:main neural-style.core)
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
:description "Example of using pre-trained models with MXNet"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]
[net.mikera/imagez "0.12.0"]
[thinktopic/think.image "0.4.16"]]
:main pre-trained-models.fine-tune)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/profiler/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
(defproject profiler "0.1.0-SNAPSHOT"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]]
:main profiler.core)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/rnn/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
:description "RNN example"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]]
:main rnn.train-char-rnn)
6 changes: 3 additions & 3 deletions contrib/clojure-package/examples/tutorial/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
;; Uncomment the one appropriate for your machine & configuration:
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-cpu "1.4.0"]
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-gpu "1.4.0"]
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-osx-cpu "1.4.0"]])
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-cpu "1.5.0"]
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-gpu "1.5.0"]
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-osx-cpu "1.5.0"]])
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
:description "Visualization example"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]]
:main visualization.core)
Loading