This repository was archived by the owner on Nov 17, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Clojure Contrib Package #11205
Merged
Merged
Clojure Contrib Package #11205
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
21b6d7b
Initial commit for clojure package - src code
gigasquid d3961ff
examples for clojure package
gigasquid d4645b1
Add cloverage code coverage plugin.
gigasquid 8d50031
add bug fix from Kamil Hryniewicz
gigasquid 7b4b496
add basic optimizer test
gigasquid e7e1d27
add Kamil to thanks
gigasquid 838330e
add Christian Weilbach
gigasquid 8de88ed
add set -e to scripts
gigasquid 2f876ba
added documentation about the current process of building and deploying
gigasquid 948e24a
unit tests for util
gigasquid d39cd66
add tests for generator
gigasquid ecd065b
make the test-validate use a spec in util-test
gigasquid 4e6f003
update to 1.2.1 scala version
gigasquid 7f2a936
add generator test fix & enhancements from Burin
gigasquid b3fa023
add test for eval-metric
gigasquid 0bf3961
add callback unit test
gigasquid 2894adc
switch project default to linux-cpu for CI
gigasquid 84cfd7f
Merge branch 'master' into clojure-package
gigasquid 3c48fa3
remove reference to the clojars snapshot
gigasquid 07add1b
@kurman feedback newline/scripts
gigasquid 5662b98
feedback from @kurman - use scala instead of $
gigasquid ba7b5a3
move gitignore back into clojure-package
gigasquid 6d7b128
feedback from @kurman - lowercase testing.md
gigasquid 310693f
feedback from @kurman use generate code alias for better clarity
gigasquid 97b5057
feedback from @kurman - cnn text example
gigasquid ad97924
Add clojure package testing to CI
gigasquid 0358d95
bug fix from jimdunn - skip validation in fit when eval-data is nil
gigasquid edf795a
Change CI to use locally installed scala jars instead of nexus
gigasquid 29fbe28
clean ci & bump clojure-package version to be inline with scala pacak…
gigasquid acfec15
update cat image link since the other one is broken
gigasquid 69f9eb6
change cat link to one in the repo
gigasquid 0863846
Merge branch 'master' into clojure-package
gigasquid 29485b8
Update README
gigasquid 6567766
missing minus sign in example - contributed by jimdunn
gigasquid 3669345
feedback from @lanking520
gigasquid fa9f23b
feedback from @lanking520 - specify that branch checkout is optional
gigasquid 6760c90
feedback from @yzhliu - update README ml.dmlc -> org.apache
gigasquid File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| # build and install are separated so changes to build don't invalidate | ||
| # the whole docker cache for the image | ||
|
|
||
| set -ex | ||
| # install libraries for mxnet's clojure package on ubuntu | ||
| echo 'Installing Clojure...' | ||
|
|
||
| wget https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein | ||
| chmod 777 lein | ||
| sudo cp lein /usr/local/bin | ||
| sudo apt install libcurl3 | ||
| sudo add-apt-repository ppa:timsc/opencv-3.4 | ||
| sudo apt-get update | ||
| sudo apt install -y libopencv-imgcodecs3.4 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,8 +20,8 @@ | |
| :dependencies [[org.clojure/clojure "1.9.0"] | ||
| [t6/from-scala "0.3.0"] | ||
| ;; Choose the right dependency for your system | ||
| [org.apache.mxnet/mxnet-full_2.11-osx-x86_64-cpu "1.2.1"] | ||
| ;[org.apache.mxnet/mxnet-full_2.11-linux-x86_64-cpu "1.2.1"] | ||
| ;[org.apache.mxnet/mxnet-full_2.11-osx-x86_64-cpu "1.2.1"] | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am wondering if Clojure always depended on Maven jars, would the clojure-jars be always 1 release behind Scala? or are you consuming from the source build from the master?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The CI build is taking it from master when the jars are installed locally with |
||
| [org.apache.mxnet/mxnet-full_2.11-linux-x86_64-cpu "1.2.1"] | ||
| ;[org.apache.mxnet/mxnet-full_2.11-linux-x86_64-gpu "1.2.1"] | ||
| [org.clojure/tools.logging "0.4.0"] | ||
| [org.apache.logging.log4j/log4j-core "2.8.1"] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/bin/bash | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| set -evx | ||
|
|
||
| MXNET_HOME=${PWD} | ||
| cd ${MXNET_HOME}/contrib/clojure-package | ||
| lein test |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the opencv version that is in ubuntu too old? Is not clear why we are adding this to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's also causing some issues in CI:
http://jenkins.mxnet-ci.amazon-ml.com/blue/organizations/jenkins/incubator-mxnet/detail/PR-11205/19/pipeline
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes - that is the issue I'm looking into. It appears that the version of the opencv that was used to build the scala jars for nexus is different than the opencv required by caffe. I'm looking into changing the unit test from the clojure package to run off of the ones generated by
make scalapkgandmake scalainstallinstead, (which is most likely a better way to go anyway).Using the scala jars from nexus on ubuntu uses this version
sudo apt install -y libopencv-imgcodecs3.4which clashes with the one required in caffe build
libopencv-dev