parent
0eb56ef45f
commit
97bcda699d
|
|
@ -135,7 +135,7 @@ import java.util.List;
|
||||||
@Platform(value = "linux-armhf", preloadpath = {"/usr/arm-linux-gnueabihf/lib/", "/usr/lib/arm-linux-gnueabihf/"}),
|
@Platform(value = "linux-armhf", preloadpath = {"/usr/arm-linux-gnueabihf/lib/", "/usr/lib/arm-linux-gnueabihf/"}),
|
||||||
@Platform(value = "linux-arm64", preloadpath = {"/usr/aarch64-linux-gnu/lib/", "/usr/lib/aarch64-linux-gnu/"}),
|
@Platform(value = "linux-arm64", preloadpath = {"/usr/aarch64-linux-gnu/lib/", "/usr/lib/aarch64-linux-gnu/"}),
|
||||||
@Platform(value = "linux-ppc64", preloadpath = {"/usr/powerpc64-linux-gnu/lib/", "/usr/powerpc64le-linux-gnu/lib/", "/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}),
|
@Platform(value = "linux-ppc64", preloadpath = {"/usr/powerpc64-linux-gnu/lib/", "/usr/powerpc64le-linux-gnu/lib/", "/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}),
|
||||||
@Platform(value = "windows", preload = {"libwinpthread-1", "libgcc_s_seh-1", "libgomp-1", "libstdc++-6", "nd4jcuda"})
|
@Platform(value = "windows", preload = {"libwinpthread-1", "libgcc_s_seh-1", "libgomp-1", "libstdc++-6"}) //, "nd4jcuda"})
|
||||||
})
|
})
|
||||||
public class Nd4jCudaPresets implements LoadEnabled, InfoMapper {
|
public class Nd4jCudaPresets implements LoadEnabled, InfoMapper {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -314,7 +314,7 @@ chipList.each { String thisChip ->
|
||||||
currentCompiler = System.getProperty("org.bytedeco.javacpp.platform.compiler")
|
currentCompiler = System.getProperty("org.bytedeco.javacpp.platform.compiler")
|
||||||
System.setProperty("org.bytedeco.javacpp.platform.compiler", cl)
|
System.setProperty("org.bytedeco.javacpp.platform.compiler", cl)
|
||||||
System.setProperty("platform.compiler.cpp11", cl)
|
System.setProperty("platform.compiler.cpp11", cl)
|
||||||
logger.quiet("Task ${thisTask.name} overrides compiler '${currentCompiler}' with '${cl}'.")
|
logger.quiet("Task ${name} overrides compiler '${currentCompiler}' with '${cl}'.")
|
||||||
|
|
||||||
}
|
}
|
||||||
doLast {
|
doLast {
|
||||||
|
|
@ -324,12 +324,12 @@ chipList.each { String thisChip ->
|
||||||
//System.setProperty("org.bytedeco.javacpp.platform.compiler.cpp11", cl)
|
//System.setProperty("org.bytedeco.javacpp.platform.compiler.cpp11", cl)
|
||||||
|
|
||||||
proc = ["cmd.exe", "/c", "${VISUAL_STUDIO_VCVARS_CMD} > nul && set"].execute()
|
proc = ["cmd.exe", "/c", "${VISUAL_STUDIO_VCVARS_CMD} > nul && set"].execute()
|
||||||
thisTask.environmentVariables = thisTask.environmentVariables ?: [:]
|
environmentVariables = environmentVariables ?: [:]
|
||||||
def lines = proc.text.split("\\r?\\n")
|
def lines = proc.text.split("\\r?\\n")
|
||||||
for (def line in lines) {
|
for (def line in lines) {
|
||||||
if (line.contains("=")) {
|
if (line.contains("=")) {
|
||||||
def parts = line.split("=")
|
def parts = line.split("=")
|
||||||
thisTask.environmentVariables.put(parts[0], parts[1])
|
environmentVariables.put(parts[0], parts[1])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
/*
|
|
||||||
*
|
|
||||||
* ******************************************************************************
|
|
||||||
* *
|
|
||||||
* * This program and the accompanying materials are made available under the
|
|
||||||
* * terms of the Apache License, Version 2.0 which is available at
|
|
||||||
* * https://www.apache.org/licenses/LICENSE-2.0.
|
|
||||||
* *
|
|
||||||
* * See the NOTICE file distributed with this work for additional
|
|
||||||
* * information regarding copyright ownership.
|
|
||||||
* * 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.
|
|
||||||
* *
|
|
||||||
* * SPDX-License-Identifier: Apache-2.0
|
|
||||||
* *****************************************************************************
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.nd4j.nativeblas.cuda;
|
|
||||||
|
|
||||||
import org.nd4j.nativeblas.NativeOps;
|
|
||||||
|
|
||||||
public abstract class Nd4jCudaHelper extends Nd4jCudaPresets implements NativeOps {
|
|
||||||
}
|
|
||||||
|
|
@ -1,252 +0,0 @@
|
||||||
/*
|
|
||||||
*
|
|
||||||
* ******************************************************************************
|
|
||||||
* *
|
|
||||||
* * This program and the accompanying materials are made available under the
|
|
||||||
* * terms of the Apache License, Version 2.0 which is available at
|
|
||||||
* * https://www.apache.org/licenses/LICENSE-2.0.
|
|
||||||
* *
|
|
||||||
* * See the NOTICE file distributed with this work for additional
|
|
||||||
* * information regarding copyright ownership.
|
|
||||||
* * 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.
|
|
||||||
* *
|
|
||||||
* * SPDX-License-Identifier: Apache-2.0
|
|
||||||
* *****************************************************************************
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.nd4j.nativeblas.cuda;
|
|
||||||
|
|
||||||
import org.bytedeco.javacpp.ClassProperties;
|
|
||||||
import org.bytedeco.javacpp.LoadEnabled;
|
|
||||||
import org.bytedeco.javacpp.Loader;
|
|
||||||
import org.bytedeco.javacpp.annotation.Platform;
|
|
||||||
import org.bytedeco.javacpp.annotation.Properties;
|
|
||||||
import org.bytedeco.javacpp.tools.Info;
|
|
||||||
import org.bytedeco.javacpp.tools.InfoMap;
|
|
||||||
import org.bytedeco.javacpp.tools.InfoMapper;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @author saudet
|
|
||||||
*/
|
|
||||||
@Properties(target = "org.nd4j.nativeblas.Nd4jCuda", helper = "org.nd4j.nativeblas.cuda.Nd4jCudaHelper",
|
|
||||||
value = {
|
|
||||||
@Platform(
|
|
||||||
define = "LIBND4J_ALL_OPS",
|
|
||||||
include = {
|
|
||||||
"array/DataType.h",
|
|
||||||
"array/DataBuffer.h",
|
|
||||||
"array/PointerDeallocator.h",
|
|
||||||
"array/PointerWrapper.h",
|
|
||||||
"array/ConstantDescriptor.h",
|
|
||||||
"array/ConstantDataBuffer.h",
|
|
||||||
"array/ConstantShapeBuffer.h",
|
|
||||||
"array/ConstantOffsetsBuffer.h",
|
|
||||||
"array/TadPack.h",
|
|
||||||
"execution/ErrorReference.h",
|
|
||||||
"execution/Engine.h",
|
|
||||||
"execution/ExecutionMode.h",
|
|
||||||
"memory/MemoryType.h",
|
|
||||||
"system/Environment.h",
|
|
||||||
"types/utf8string.h",
|
|
||||||
"legacy/NativeOps.h",
|
|
||||||
"memory/ExternalWorkspace.h",
|
|
||||||
"memory/Workspace.h",
|
|
||||||
"indexing/NDIndex.h",
|
|
||||||
"indexing/IndicesList.h",
|
|
||||||
"array/DataType.h",
|
|
||||||
"graph/VariableType.h",
|
|
||||||
"graph/ArgumentsList.h",
|
|
||||||
"types/pair.h",
|
|
||||||
"types/pair.h",
|
|
||||||
"array/NDArray.h",
|
|
||||||
"array/NDArrayList.h",
|
|
||||||
"array/ResultSet.h",
|
|
||||||
"graph/RandomGenerator.h",
|
|
||||||
"graph/Variable.h",
|
|
||||||
"graph/VariablesSet.h",
|
|
||||||
"graph/FlowPath.h",
|
|
||||||
"graph/Intervals.h",
|
|
||||||
"graph/Stash.h",
|
|
||||||
"graph/GraphState.h",
|
|
||||||
"graph/VariableSpace.h",
|
|
||||||
"helpers/helper_generator.h",
|
|
||||||
"graph/profiling/GraphProfile.h",
|
|
||||||
"graph/profiling/NodeProfile.h",
|
|
||||||
"graph/Context.h",
|
|
||||||
"graph/ContextPrototype.h",
|
|
||||||
"graph/ResultWrapper.h",
|
|
||||||
"helpers/shape.h",
|
|
||||||
"array/ShapeList.h",
|
|
||||||
//"system/op_boilerplate.h",
|
|
||||||
"ops/InputType.h",
|
|
||||||
"ops/declarable/OpDescriptor.h",
|
|
||||||
"ops/declarable/PlatformHelper.h",
|
|
||||||
"ops/declarable/BroadcastableOp.h",
|
|
||||||
"ops/declarable/BroadcastableBoolOp.h",
|
|
||||||
"helpers/OpArgsHolder.h",
|
|
||||||
"ops/declarable/DeclarableOp.h",
|
|
||||||
"ops/declarable/DeclarableListOp.h",
|
|
||||||
"ops/declarable/DeclarableReductionOp.h",
|
|
||||||
"ops/declarable/DeclarableCustomOp.h",
|
|
||||||
"ops/declarable/BooleanOp.h",
|
|
||||||
"ops/declarable/LogicOp.h",
|
|
||||||
"ops/declarable/OpRegistrator.h",
|
|
||||||
"execution/ContextBuffers.h",
|
|
||||||
"execution/LaunchContext.h",
|
|
||||||
"array/ShapeDescriptor.h",
|
|
||||||
"array/TadDescriptor.h",
|
|
||||||
"array/TadPack.h",
|
|
||||||
"helpers/DebugInfo.h",
|
|
||||||
"ops/declarable/CustomOperations.h",
|
|
||||||
"build_info.h",
|
|
||||||
},
|
|
||||||
exclude = {"ops/declarable/headers/activations.h",
|
|
||||||
"ops/declarable/headers/boolean.h",
|
|
||||||
"ops/declarable/headers/broadcastable.h",
|
|
||||||
"ops/declarable/headers/convo.h",
|
|
||||||
"ops/declarable/headers/list.h",
|
|
||||||
"ops/declarable/headers/recurrent.h",
|
|
||||||
"ops/declarable/headers/transforms.h",
|
|
||||||
"ops/declarable/headers/parity_ops.h",
|
|
||||||
"ops/declarable/headers/shape.h",
|
|
||||||
"ops/declarable/headers/random.h",
|
|
||||||
"ops/declarable/headers/nn.h",
|
|
||||||
"ops/declarable/headers/blas.h",
|
|
||||||
"ops/declarable/headers/bitwise.h",
|
|
||||||
"ops/declarable/headers/tests.h",
|
|
||||||
"ops/declarable/headers/loss.h",
|
|
||||||
"ops/declarable/headers/datatypes.h",
|
|
||||||
"ops/declarable/headers/third_party.h",
|
|
||||||
"cnpy/cnpy.h"
|
|
||||||
},
|
|
||||||
compiler = {"cpp11", "nowarnings"},
|
|
||||||
library = "jnind4jcuda",
|
|
||||||
link = "nd4jcuda"),
|
|
||||||
|
|
||||||
@Platform(value = "linux", preload = "gomp@.1", preloadpath = {"/lib64/", "/lib/", "/usr/lib64/", "/usr/lib/", "/usr/local/cuda/lib64"}),
|
|
||||||
@Platform(value = "linux-armhf", preloadpath = {"/usr/arm-linux-gnueabihf/lib/", "/usr/lib/arm-linux-gnueabihf/"}),
|
|
||||||
@Platform(value = "linux-arm64", preloadpath = {"/usr/aarch64-linux-gnu/lib/", "/usr/lib/aarch64-linux-gnu/"}),
|
|
||||||
@Platform(value = "linux-ppc64", preloadpath = {"/usr/powerpc64-linux-gnu/lib/", "/usr/powerpc64le-linux-gnu/lib/", "/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"})
|
|
||||||
//@Platform(value = "windows", preload = {"libwinpthread-1", "libgcc_s_seh-1", "libgomp-1", "libstdc++-6", "nd4jcuda"})
|
|
||||||
})
|
|
||||||
public class Nd4jCudaPresets implements LoadEnabled, InfoMapper {
|
|
||||||
|
|
||||||
@Override public void init(ClassProperties properties) {
|
|
||||||
String platform = properties.getProperty("platform");
|
|
||||||
List<String> preloads = properties.get("platform.preload");
|
|
||||||
List<String> resources = properties.get("platform.preloadresource");
|
|
||||||
|
|
||||||
// Only apply this at load time since we don't want to copy the CUDA libraries here
|
|
||||||
if (!Loader.isLoadLibraries()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
int i = 0;
|
|
||||||
/*
|
|
||||||
String[] libs = {"cudart", "cublasLt", "cublas", "curand", "cusolver", "cusparse", "cudnn",
|
|
||||||
"cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer",
|
|
||||||
"cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"};
|
|
||||||
|
|
||||||
*/
|
|
||||||
// test no preload
|
|
||||||
String[] libs = {};
|
|
||||||
for (String lib : libs) {
|
|
||||||
if (platform.startsWith("linux")) {
|
|
||||||
lib += lib.startsWith("cudnn") ? "@.8" : lib.equals("curand") ? "@.10" : lib.equals("cufft") ? "@.11" : "@.12";
|
|
||||||
} else if (platform.startsWith("windows")) {
|
|
||||||
lib += lib.startsWith("cudnn") ? "64_8" : lib.equals("cufft") ? "64_11" : lib.equals("cusolver") ? "64_11" : lib.equals("curand") ? "64_10" : "64_12";
|
|
||||||
} else {
|
|
||||||
continue; // no CUDA
|
|
||||||
}
|
|
||||||
if (!preloads.contains(lib)) {
|
|
||||||
preloads.add(i++, lib);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (i > 0) {
|
|
||||||
resources.add("/org/bytedeco/cuda/");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void map(InfoMap infoMap) {
|
|
||||||
infoMap.put(new Info("thread_local", "ND4J_EXPORT", "INLINEDEF", "CUBLASWINAPI", "FORCEINLINE",
|
|
||||||
"_CUDA_H", "_CUDA_D", "_CUDA_G", "_CUDA_HD", "LIBND4J_ALL_OPS", "NOT_EXCLUDED").cppTypes().annotations())
|
|
||||||
.put(new Info("NativeOps.h", "build_info.h").objectify())
|
|
||||||
.put(new Info("OpaqueTadPack").pointerTypes("OpaqueTadPack"))
|
|
||||||
.put(new Info("OpaqueResultWrapper").pointerTypes("OpaqueResultWrapper"))
|
|
||||||
.put(new Info("OpaqueShapeList").pointerTypes("OpaqueShapeList"))
|
|
||||||
.put(new Info("OpaqueVariablesSet").pointerTypes("OpaqueVariablesSet"))
|
|
||||||
.put(new Info("OpaqueVariable").pointerTypes("OpaqueVariable"))
|
|
||||||
.put(new Info("OpaqueConstantDataBuffer").pointerTypes("OpaqueConstantDataBuffer"))
|
|
||||||
.put(new Info("OpaqueConstantShapeBuffer").pointerTypes("OpaqueConstantShapeBuffer"))
|
|
||||||
.put(new Info("OpaqueConstantOffsetsBuffer").pointerTypes("OpaqueConstantOffsetsBuffer"))
|
|
||||||
.put(new Info("OpaqueContext").pointerTypes("OpaqueContext"))
|
|
||||||
.put(new Info("OpaqueRandomGenerator").pointerTypes("OpaqueRandomGenerator"))
|
|
||||||
.put(new Info("OpaqueLaunchContext").pointerTypes("OpaqueLaunchContext"))
|
|
||||||
.put(new Info("OpaqueDataBuffer").pointerTypes("OpaqueDataBuffer"))
|
|
||||||
.put(new Info("const char").valueTypes("byte").pointerTypes("@Cast(\"char*\") String",
|
|
||||||
"@Cast(\"char*\") BytePointer"))
|
|
||||||
.put(new Info("char").valueTypes("char").pointerTypes("@Cast(\"char*\") BytePointer",
|
|
||||||
"@Cast(\"char*\") String"))
|
|
||||||
.put(new Info("Nd4jPointer").cast().valueTypes("Pointer").pointerTypes("PointerPointer"))
|
|
||||||
.put(new Info("Nd4jLong").cast().valueTypes("long").pointerTypes("LongPointer", "LongBuffer",
|
|
||||||
"long[]"))
|
|
||||||
.put(new Info("Nd4jStatus").cast().valueTypes("int").pointerTypes("IntPointer", "IntBuffer",
|
|
||||||
"int[]"))
|
|
||||||
.put(new Info("float16").cast().valueTypes("short").pointerTypes("ShortPointer", "ShortBuffer",
|
|
||||||
"short[]"))
|
|
||||||
.put(new Info("bfloat16").cast().valueTypes("short").pointerTypes("ShortPointer", "ShortBuffer",
|
|
||||||
"short[]"));
|
|
||||||
|
|
||||||
infoMap.put(new Info("__CUDACC__", "MAX_UINT", "HAVE_MKLDNN").define(false))
|
|
||||||
.put(new Info("__JAVACPP_HACK__", "LIBND4J_ALL_OPS","__CUDABLAS__").define(true))
|
|
||||||
.put(new Info("std::initializer_list", "cnpy::NpyArray", "sd::NDArray::applyLambda", "sd::NDArray::applyPairwiseLambda",
|
|
||||||
"sd::graph::FlatResult", "sd::graph::FlatVariable", "sd::NDArray::subarray", "std::shared_ptr", "sd::PointerWrapper", "sd::PointerDeallocator").skip())
|
|
||||||
.put(new Info("std::string").annotations("@StdString").valueTypes("BytePointer", "String")
|
|
||||||
.pointerTypes("@Cast({\"char*\", \"std::string*\"}) BytePointer"))
|
|
||||||
.put(new Info("std::pair<int,int>").pointerTypes("IntIntPair").define())
|
|
||||||
.put(new Info("std::vector<std::vector<int> >").pointerTypes("IntVectorVector").define())
|
|
||||||
.put(new Info("std::vector<std::vector<Nd4jLong> >").pointerTypes("LongVectorVector").define())
|
|
||||||
.put(new Info("std::vector<sd::NDArray*>").pointerTypes("NDArrayVector").define())
|
|
||||||
.put(new Info("std::vector<const sd::NDArray*>").pointerTypes("ConstNDArrayVector").define())
|
|
||||||
.put(new Info("bool").cast().valueTypes("boolean").pointerTypes("BooleanPointer", "boolean[]"))
|
|
||||||
.put(new Info("sd::graph::ResultWrapper").base("org.nd4j.nativeblas.ResultWrapperAbstraction").define())
|
|
||||||
.put(new Info("sd::IndicesList").purify());
|
|
||||||
/*
|
|
||||||
String classTemplates[] = {
|
|
||||||
"sd::NDArray",
|
|
||||||
"sd::NDArrayList",
|
|
||||||
"sd::ResultSet",
|
|
||||||
"sd::OpArgsHolder",
|
|
||||||
"sd::graph::GraphState",
|
|
||||||
"sd::graph::Variable",
|
|
||||||
"sd::graph::VariablesSet",
|
|
||||||
"sd::graph::Stash",
|
|
||||||
"sd::graph::VariableSpace",
|
|
||||||
"sd::graph::Context",
|
|
||||||
"sd::graph::ContextPrototype",
|
|
||||||
"sd::ops::DeclarableOp",
|
|
||||||
"sd::ops::DeclarableListOp",
|
|
||||||
"sd::ops::DeclarableReductionOp",
|
|
||||||
"sd::ops::DeclarableCustomOp",
|
|
||||||
"sd::ops::BooleanOp",
|
|
||||||
"sd::ops::BroadcastableOp",
|
|
||||||
"sd::ops::LogicOp"};
|
|
||||||
for (String t : classTemplates) {
|
|
||||||
String s = t.substring(t.lastIndexOf(':') + 1);
|
|
||||||
infoMap.put(new Info(t + "<float>").pointerTypes("Float" + s))
|
|
||||||
.put(new Info(t + "<float16>").pointerTypes("Half" + s))
|
|
||||||
.put(new Info(t + "<double>").pointerTypes("Double" + s));
|
|
||||||
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
infoMap.put(new Info("sd::ops::OpRegistrator::updateMSVC").skip());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue