Merge eclipse changes, fix merge conflicts - Githubissues

KonduitAI / deeplearning4j

Eclipse Deeplearning4j, ND4J, DataVec and more - deep learning & linear algebra for Java/Scala with GPUs + Spark

http://deeplearning4j.konduit.ai

Apache License 2.0

11 stars 7 forks source link

Merge eclipse changes, fix merge conflicts #535

Closed agibsonccc closed 4 years ago

agibsonccc commented 4 years ago

What changes were proposed in this pull request?

(Please fill in changes proposed in this fix)

How was this patch tested?

(Please explain how this patch was tested. E.g. unit tests, integration tests, manual tests)

Quick checklist

The following checklist helps ensure your PR is complete:

[ ] Eclipse Contributor Agreement signed, and signed commits - see IP Requirements page for details
[ ] Reviewed the Contributing Guidelines and followed the steps within.
[ ] Created tests for any significant new code additions.
[ ] Relevant tests for your changes are passing.