Remove the two files that get generated by javacpp to avoid conflicts. Also add them to .gitignore

Signed-off-by: Bam4d <chrisbam4d@gmail.com>
2020-03-10 10:05:56 +00:00 · 2020-03-10 10:05:56 +00:00 · 0459cf9525
commit 0459cf9525
parent 58aa5a3a9b
3 changed files with 5 additions and 35013 deletions
--- a/.gitignore
+++ b/.gitignore
@ -65,4 +65,8 @@ doc_sources_*

 # Python virtual environments
 venv/
-venv2/
+venv2/
+
+# Ignore the nd4j files that are created by javacpp at build to stop merge conflicts
+nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java
+nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java
--- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java
+++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java
--- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java
+++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java