Permalink
Browse files

Add change-scala-versions.sh and rearrange artifacts to support CUDA 8.0

  • Loading branch information...
1 parent 2575977 commit 4edcaff47fba8460593156307a9ca4bb0cd9ce48 @saudet saudet committed Sep 14, 2016
Showing with 186 additions and 181 deletions.
  1. +86 −0 change-cuda-versions.sh
  2. +0 −86 nd4j-backends/nd4j-backend-impls/nd4j-cuda-7.5-platform/pom.xml
  3. +49 −0 nd4j-backends/nd4j-backend-impls/nd4j-cuda-platform/pom.xml
  4. +9 −3 nd4j-backends/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/pom.xml
  5. 0 ...4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/Allocator.java
  6. 0 ...ls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/concurrency/AtomicState.java
  7. 0 ...-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/concurrency/DeviceAllocationsTracker.java
  8. 0 ...end-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/concurrency/Lock.java
  9. 0 ...-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/concurrency/RRWLock.java
  10. 0 ...-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/context/ContextPack.java
  11. 0 ...-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/context/ContextPool.java
  12. 0 ...ls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/context/ExternalContext.java
  13. 0 ...4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/context/impl/BasicContextPool.java
  14. 0 ...-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/context/impl/LimitedContextPool.java
  15. 0 ...j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/context/impl/PackedContextPool.java
  16. 0 ...nd-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/enums/AccessState.java
  17. 0 ...impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/enums/Aggressiveness.java
  18. 0 ...pls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/enums/AllocationStatus.java
  19. 0 ...-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/enums/CudaConstants.java
  20. 0 ...kend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/enums/SyncState.java
  21. 0 ...j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/garbage/GarbageBufferReference.java
  22. 0 ...cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/garbage/GarbageResourceReference.java
  23. 0 ...impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/impl/AllocationPoint.java
  24. 0 ...impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/impl/AllocationShape.java
  25. 0 ...impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/impl/AtomicAllocator.java
  26. 0 ...end-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/impl/NestedPoint.java
  27. 0 ...impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/pointers/CudaPointer.java
  28. 0 ...mpls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/pointers/PointersPair.java
  29. 0 ...ls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/pointers/cuda/CUcontext.java
  30. 0 ...d4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/pointers/cuda/cublasHandle_t.java
  31. 0 .../{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/pointers/cuda/cudaEvent_t.java
  32. 0 ...{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/pointers/cuda/cudaStream_t.java
  33. 0 ...-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/tad/BasicTADManager.java
  34. 0 ...impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/tad/DeviceTADManager.java
  35. 0 ...ckend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/time/RateTimer.java
  36. 0 ...4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/time/Ring.java
  37. 0 ...nd-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/time/TimeProvider.java
  38. 0 ...mpls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/time/impl/BinaryTimer.java
  39. 0 ...mpls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/time/impl/SimpleTimer.java
  40. 0 ...a-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/time/providers/MillisecondsProvider.java
  41. 0 ...da-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/time/providers/NanosecondsProvider.java
  42. 0 ...cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/time/providers/OperativeProvider.java
  43. 0 ...mpls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/time/rings/LockedRing.java
  44. 0 ...mpls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/allocator/utils/AllocationUtils.java
  45. 0 .../nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/balance/Balancer.java
  46. 0 ...mpls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/concurrency/CudaAffinityManager.java
  47. 0 ...end-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/concurrency/EventsProvider.java
  48. 0 ...d4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/conf/Configuration.java
  49. 0 ...j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/conf/CudaEnvironment.java
  50. 0 ...backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/conf/DeviceInformation.java
  51. 0 ...end-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/constant/ConstantProtector.java
  52. 0 ...d-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/constant/CudaConstantHandler.java
  53. 0 ...nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/constant/ProtectedCudaConstantHandler.java
  54. 0 ...4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/constant/ProtectedCudaShapeInfoProvider.java
  55. 0 ...4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/flow/FlowController.java
  56. 0 ...{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/flow/impl/AsynchronousFlowController.java
  57. 0 ...d-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/flow/impl/GridFlowController.java
  58. 0 .../{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/flow/impl/SynchronousFlowController.java
  59. 0 ...-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/handler/MemoryHandler.java
  60. 0 ...d-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/handler/impl/CudaZeroHandler.java
  61. 0 ...-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/memory/MemoryProvider.java
  62. 0 .../{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/memory/impl/CudaCachingZeroProvider.java
  63. 0 ...impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/memory/impl/CudaDirectProvider.java
  64. 0 .../{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/memory/impl/CudaFullCachingProvider.java
  65. 0 .../nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/perf/OpDashboard.java
  66. 0 ...ackend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/jita/perf/data/StringCounter.java
  67. 0 ...ls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/CachedShapeInfoProvider.java
  68. 0 ...ackend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/CublasPointer.java
  69. 0 ...ckend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/JCublasBackend.java
  70. 0 ...ckend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArray.java
  71. 0 ...mpls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/JCublasNDArrayFactory.java
  72. 0 ...ckend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/JCublasWrapper.java
  73. 0 ...d-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/blas/JcublasLapack.java
  74. 0 ...d-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/blas/JcublasLevel1.java
  75. 0 ...d-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/blas/JcublasLevel2.java
  76. 0 ...d-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/blas/JcublasLevel3.java
  77. 0 ...ls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/buffer/AddressRetriever.java
  78. 0 .../{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/buffer/BaseCudaDataBuffer.java
  79. 0 ...nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaDoubleDataBuffer.java
  80. 0 ...{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaFloatDataBuffer.java
  81. 0 .../{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaHalfDataBuffer.java
  82. 0 ...s/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/buffer/CudaIntDataBuffer.java
  83. 0 ...s/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/buffer/DevicePointerInfo.java
  84. 0 ...d-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/buffer/JCudaBuffer.java
  85. 0 ...-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/buffer/factory/CudaDataBufferFactory.java
  86. 0 ...mpls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/complex/ComplexDouble.java
  87. 0 ...impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/complex/ComplexFloat.java
  88. 0 ...4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/complex/JCublasComplexNDArray.java
  89. 0 ...mpls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/context/ContextHolder.java
  90. 0 ...-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/context/CudaContext.java
  91. 0 ...-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaExecutioner.java
  92. 0 ...a-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/ops/executioner/CudaGridExecutioner.java
  93. 0 ...ackend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/util/CudaArgs.java
  94. 0 ...ackend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/util/FFTUtils.java
  95. 0 ...-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/java/org/nd4j/linalg/jcublas/util/OpUtil.java
  96. 0 nd4j-backends/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/License.txt
  97. 0 ...4j-cuda-7.5 → nd4j-cuda}/src/main/resources/META-INF/services/org.nd4j.linalg.factory.Nd4jBackend
  98. 0 ...ckends/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/cudafunctions.properties
  99. 0 ...nds/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/function_threads.properties
  100. BIN .../nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/JCublas-windows-x86_64.dll
  101. BIN ...nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/JCublas2-windows-x86_64.dll
  102. BIN ...j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/JCudaDriver-windows-x86_64.dll
  103. BIN ...-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/JCudaRuntime-windows-x86_64.dll
  104. BIN ...s/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/JCufft-windows-x86_64.dll
  105. BIN .../nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/JCurand-windows-x86_64.dll
  106. BIN ...d4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/JCusolver-windows-x86_64.dll
  107. BIN ...d4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/JCusparse-windows-x86_64.dll
  108. BIN ...4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCublas-apple-x86_64.dylib
  109. BIN .../nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCublas-linux-x86_64.so
  110. BIN ...j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCublas2-apple-x86_64.dylib
  111. BIN ...nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCublas2-linux-x86_64.so
  112. BIN ...ackends/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCudaCommonJNI.a
  113. BIN ...ackend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCudaDriver-apple-x86_64.dylib
  114. BIN ...j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCudaDriver-linux-x86_64.so
  115. BIN ...ckend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCudaRuntime-apple-x86_64.dylib
  116. BIN ...-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCudaRuntime-linux-x86_64.so
  117. BIN ...d4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCufft-apple-x86_64.dylib
  118. BIN ...s/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCufft-linux-x86_64.so
  119. BIN ...4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCurand-apple-x86_64.dylib
  120. BIN .../nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCurand-linux-x86_64.so
  121. BIN ...-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCusolver-apple-x86_64.dylib
  122. BIN ...d4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCusolver-linux-x86_64.so
  123. BIN ...-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCusparse-apple-x86_64.dylib
  124. BIN ...d4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/lib/libJCusparse-linux-x86_64.so
  125. 0 nd4j-backends/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/native.properties
  126. 0 ...ackends/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/main/resources/nd4j-jcublas.properties
  127. 0 ...a-7.5 → nd4j-cuda}/src/main/resources/org/bytedeco/javacpp/properties/linux-ppc64-nd4j.properties
  128. 0 ...7.5 → nd4j-cuda}/src/main/resources/org/bytedeco/javacpp/properties/linux-ppc64le-nd4j.properties
  129. 0 ...-7.5 → nd4j-cuda}/src/main/resources/org/bytedeco/javacpp/properties/linux-x86_64-nd4j.properties
  130. 0 ...7.5 → nd4j-cuda}/src/main/resources/org/bytedeco/javacpp/properties/macosx-x86_64-nd4j.properties
  131. 0 ....5 → nd4j-cuda}/src/main/resources/org/bytedeco/javacpp/properties/windows-x86_64-nd4j.properties
  132. 0 ...4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/ArrayUtilsTests.java
  133. 0 ...d4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/AveragingTests.java
  134. 0 ...s/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/CublasTests.java
  135. 0 ...d4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/CudaAccumTests.java
  136. 0 ...nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/CudaBlasTests.java
  137. 0 ...backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/CudaBroadcastTests.java
  138. 0 ...ackend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/CudaExecutionerTest.java
  139. 0 ...ckend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/CudaIndexReduceTests.java
  140. 0 ...mpls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/CudaPairwiseTrainformsTests.java
  141. 0 ...j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/CudaReduce3Tests.java
  142. 0 ...j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/CudaScalarsTests.java
  143. 0 ...ackend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/CudaTransformsTests.java
  144. 0 .../nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/DoublesTests.java
  145. 0 ...end-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/ElementWiseStrideTests.java
  146. 0 .../nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/EndlessTests.java
  147. 0 .../nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/HalfOpsTests.java
  148. 0 ...nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/ShufflesTests.java
  149. 0 ...nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/jcuda/jcublas/ops/SporadicTests.java
  150. 0 ...nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/allocator/concurrency/AtomicStateTest.java
  151. 0 ... → nd4j-cuda}/src/test/java/org/nd4j/jita/allocator/concurrency/DeviceAllocationsTrackerTest.java
  152. 0 ...s/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/allocator/impl/AtomicAllocatorTest.java
  153. 0 ...ls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/allocator/tad/BasicTADManagerTest.java
  154. 0 .../{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/allocator/time/impl/BinaryTimerTest.java
  155. 0 .../{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/allocator/time/impl/SimpleTimerTest.java
  156. 0 .../{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/allocator/utils/AllocationUtilsTest.java
  157. 0 .../{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/concurrency/CudaAffinityManagerTest.java
  158. 0 ...j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/flow/impl/AsynchronousFlowControllerTest.java
  159. 0 ...s/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/memory/impl/CudaDirectProviderTest.java
  160. 0 ...-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/memory/impl/DelayedMemoryTest.java
  161. 0 ...nd-impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/jita/memory/impl/WeirdSparkTests.java
  162. 0 ...j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/linalg/jcublas/buffer/CudaFloatDataBufferTest.java
  163. 0 ...4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/linalg/jcublas/buffer/CudaHalfDataBufferTest.java
  164. 0 ...impls/{nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/linalg/jcublas/buffer/CudaHalfsTest.java
  165. 0 ...a-7.5 → nd4j-cuda}/src/test/java/org/nd4j/linalg/jcublas/ops/executioner/GridExecutionerTest.java
  166. 0 ...cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/linalg/jcublas/ops/executioner/GridRunningTests.java
  167. 0 ...nd4j-cuda-7.5 → nd4j-cuda}/src/test/java/org/nd4j/linalg/jcublas/ops/executioner/MetaOpTests.java
  168. 0 nd4j-backends/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/valgrindCudaJava
  169. 0 nd4j-backends/nd4j-backend-impls/{nd4j-cuda-7.5 → nd4j-cuda}/valgrindJava
  170. +4 −42 nd4j-backends/nd4j-backend-impls/nd4j-native-platform/pom.xml
  171. +0 −2 nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
  172. +27 −47 nd4j-backends/nd4j-backend-impls/pom.xml
  173. +11 −1 perform-release.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/env 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.
+#
+
+# This shell script is adapted from Apache Flink (in turn, adapted from Apache Spark) some modifications.
+
+set -e
+
+VALID_VERSIONS=( 7.5 8.0 )
+CUDA_75_VERSION="7\.5"
+CUDA_80_VERSION="8\.0"
+
+usage() {
+ echo "Usage: $(basename $0) [-h|--help] <cuda version to be used>
+where :
+ -h| --help Display this help text
+ valid cuda version values : ${VALID_VERSIONS[*]}
+" 1>&2
+ exit 1
+}
+
+if [[ ($# -ne 1) || ( $1 == "--help") || $1 == "-h" ]]; then
+ usage
+fi
+
+TO_VERSION=$1
+
+check_cuda_version() {
+ for i in ${VALID_VERSIONS[*]}; do [ $i = "$1" ] && return 0; done
+ echo "Invalid CUDA version: $1. Valid versions: ${VALID_VERSIONS[*]}" 1>&2
+ exit 1
+}
+
+
+check_cuda_version "$TO_VERSION"
+
+if [ $TO_VERSION = "8.0" ]; then
+ FROM_BINARY="-7\.5"
+ TO_BINARY="-8\.0"
+ FROM_VERSION=$CUDA_75_VERSION
+ TO_VERSION=$CUDA_80_VERSION
+else
+ FROM_BINARY="-8\.0"
+ TO_BINARY="-7\.5"
+ FROM_VERSION=$CUDA_80_VERSION
+ TO_VERSION=$CUDA_75_VERSION
+fi
+
+sed_i() {
+ sed -e "$1" "$2" > "$2.tmp" && mv "$2.tmp" "$2"
+}
+
+export -f sed_i
+
+echo "Updating CUDA versions in pom.xml files to CUDA $1";
+
+BASEDIR=$(dirname $0)
+
+#Artifact ids, ending with "-7.5" or "-8.0". nd4j-cuda, deeplearning4j-cuda, etc.
+find "$BASEDIR" -name 'pom.xml' -not -path '*target*' \
+ -exec bash -c "sed_i 's/\(artifactId>.*\)'$FROM_BINARY'<\/artifactId>/\1'$TO_BINARY'<\/artifactId>/g' {}" \;
+
+#Artifact ids, ending with "-7.5-platform" or "-8.0-platform". nd4j-cuda-platform, etc.
+find "$BASEDIR" -name 'pom.xml' -not -path '*target*' \
+ -exec bash -c "sed_i 's/\(artifactId>.*\)'$FROM_BINARY'-platform<\/artifactId>/\1'$TO_BINARY'-platform<\/artifactId>/g' {}" \;
+
+#CUDA versions, like <cuda.version>7.5</cuda.version>
+find "$BASEDIR" -name 'pom.xml' -not -path '*target*' \
+ -exec bash -c "sed_i 's/\(cuda.version>\)'$FROM_VERSION'<\/cuda.version>/\1'$TO_VERSION'<\/cuda.version>/g' {}" \;
+
+echo "Done updating CUDA versions.";
@@ -1,86 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>nd4j-backend-impls</artifactId>
- <groupId>org.nd4j</groupId>
- <version>0.5.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>nd4j-cuda-7.5-platform</artifactId>
- <packaging>jar</packaging>
-
- <name>nd4j-cuda-7.5-platform</name>
-
- <properties>
- <nd4j.backend>nd4j-cuda-7.5</nd4j.backend>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform0}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform1}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform2}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform3}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform4}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform5}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform6}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform7}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform8}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform9}</classifier>
- </dependency>
- </dependencies>
-
-</project>
@@ -0,0 +1,49 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>nd4j-backend-impls</artifactId>
+ <groupId>org.nd4j</groupId>
+ <version>0.5.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>nd4j-cuda-7.5-platform</artifactId>
+ <name>nd4j-cuda-platform</name>
+
+ <properties>
+ <cuda.version>7.5</cuda.version>
+ <nd4j.backend>nd4j-cuda-${cuda.version}</nd4j.backend>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${nd4j.backend}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${nd4j.backend}</artifactId>
+ <version>${project.version}</version>
+ <classifier>${javacpp.platform.linux-x86_64}</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${nd4j.backend}</artifactId>
+ <version>${project.version}</version>
+ <classifier>${javacpp.platform.macosx-x86_64}</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${nd4j.backend}</artifactId>
+ <version>${project.version}</version>
+ <classifier>${javacpp.platform.windows-x86_64}</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${nd4j.backend}</artifactId>
+ <version>${project.version}</version>
+ <classifier>${javacpp.platform.linux-ppc64le}</classifier>
+ </dependency>
+ </dependencies>
+
+</project>
@@ -7,9 +7,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>nd4j-cuda-7.5</artifactId>
- <packaging>jar</packaging>
+ <name>nd4j-cuda</name>
+
+ <properties>
+ <cuda.version>7.5</cuda.version>
+ </properties>
- <name>nd4j-cuda-7.5</name>
<build>
<testSourceDirectory>../../nd4j-tests/src/test/java</testSourceDirectory>
<testResources>
@@ -83,7 +86,10 @@
<includePath>${env.LIBND4J_HOME}/blas</includePath>
<includePath>${env.LIBND4J_HOME}/include</includePath>
</includePaths>
- <linkPath>${env.LIBND4J_HOME}/blasbuild/cuda/blas</linkPath>
+ <linkPaths>
+ <linkPath>${env.LIBND4J_HOME}/blasbuild/cuda-${cuda.version}/blas</linkPath>
+ <linkPath>${env.LIBND4J_HOME}/blasbuild/cuda/blas</linkPath>
+ </linkPaths>
</configuration>
<executions>
<execution>
@@ -7,8 +7,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>nd4j-native-platform</artifactId>
- <packaging>jar</packaging>
-
<name>nd4j-native-platform</name>
<properties>
@@ -25,61 +23,25 @@
<groupId>${project.groupId}</groupId>
<artifactId>${nd4j.backend}</artifactId>
<version>${project.version}</version>
- <classifier>${javacpp.platform0}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform1}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform2}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform3}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform4}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform5}</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${nd4j.backend}</artifactId>
- <version>${project.version}</version>
- <classifier>${javacpp.platform6}</classifier>
+ <classifier>${javacpp.platform.linux-x86_64}</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${nd4j.backend}</artifactId>
<version>${project.version}</version>
- <classifier>${javacpp.platform7}</classifier>
+ <classifier>${javacpp.platform.macosx-x86_64}</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${nd4j.backend}</artifactId>
<version>${project.version}</version>
- <classifier>${javacpp.platform8}</classifier>
+ <classifier>${javacpp.platform.windows-x86_64}</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${nd4j.backend}</artifactId>
<version>${project.version}</version>
- <classifier>${javacpp.platform9}</classifier>
+ <classifier>${javacpp.platform.linux-ppc64le}</classifier>
</dependency>
</dependencies>
@@ -7,8 +7,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>nd4j-native</artifactId>
- <packaging>jar</packaging>
-
<name>nd4j-native</name>
<dependencies>
Oops, something went wrong.

0 comments on commit 4edcaff

Please sign in to comment.