Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8772 from Bam4d/ignore_javacpp_generated 

Remove the two files that get generated by javacpp to avoid conflicts…
master
raver119 2020-03-10 13:09:37 +03:00 committed by GitHub
parent 58aa5a3a9b 0459cf9525
commit 0faf83b1b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 35013 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -66,3 +66,7 @@ doc_sources_*
# Python virtual environments # Python virtual environments
venv/ 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

10616
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/src/main/java/org/nd4j/nativeblas/Nd4jCuda.java
View File

File diff suppressed because it is too large Load Diff

24396
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/src/main/java/org/nd4j/nativeblas/Nd4jCpu.java
View File

File diff suppressed because it is too large Load Diff