From b41ee439d03583c0688cc03cba7dbd2c7a31abb2 Mon Sep 17 00:00:00 2001 From: agibsonccc Date: Sat, 6 Mar 2021 20:50:20 +0900 Subject: [PATCH] Update --- libnd4j/tests_cpu/run_tests.sh | 12 ++--- .../java/org/nd4j/nativeblas/Nd4jCpu.java | 48 +++++++++++-------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/libnd4j/tests_cpu/run_tests.sh b/libnd4j/tests_cpu/run_tests.sh index 650278752..7f778daad 100755 --- a/libnd4j/tests_cpu/run_tests.sh +++ b/libnd4j/tests_cpu/run_tests.sh @@ -56,12 +56,8 @@ if [ -n "$BUILD_PATH" ]; then export PATH="$PATH:$BUILD_PATH" fi -unameOut="$(uname -s)" -if [[ "$unameOut" == *"MINGW"* ]]; then - ../blasbuild/${CHIP}/tests_cpu/layers_tests/runtests.exe - else - ../blasbuild/${CHIP}/tests_cpu/layers_tests/runtests -fi - +unameOut="$(uname)" +echo "$OSTYPE" +../blasbuild/${CHIP}/tests_cpu/layers_tests/runtests.exe # Workaround to fix posix path conversion problem on Windows (http://mingw.org/wiki/Posix_path_conversion) -[ -f "${GTEST_OUTPUT#*:}" ] && cp -a surefire-reports/ ../target && rm -rf surefire-reports/ +#[ -f "${GTEST_OUTPUT#*:}" ] && cp -a surefire-reports/ ../target && rm -rf surefire-reports/ diff --git 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 index ad6242886..8af7dbe4d 100644 --- 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 @@ -6710,22 +6710,25 @@ public native @Cast("char*") String buildInfo(); // Parsed from graph/Context.h -/******************************************************************************* - * Copyright (c) 2015-2018 Skymind, Inc. - * Copyright (c) 2019-2020 Konduit K.K. - * - * 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. - * - * 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 - ******************************************************************************/ +/* + * ****************************************************************************** + * * + * * + * * 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 + * ***************************************************************************** + */ // // @author raver119@gmail.com @@ -6950,10 +6953,15 @@ public native @Cast("char*") String buildInfo(); * Copyright (c) 2015-2018 Skymind, Inc. * Copyright (c) 2019-2020 Konduit K.K. * +/* ****************************************************************************** + * + * * 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 @@ -23121,15 +23129,15 @@ public static final double TAD_THRESHOLD = TAD_THRESHOLD(); // #endif /** - * compare_and_bitpack - compare with greater and pack result with uint8 + * compare_and_bitpack - Compare values of input to threshold and pack resulting bits into a uint8 * * input params: - * 0 - NDArray (input) - * 1 - 0D Tensor - threshold + * 0 - NDArray (input). Note: last dimension should be divisibly by 8 + * 1 - 0D Tensor - threshold to compare against. Note: when input is bool type, the threshold is ignored * * * output: - * 0 - NDArray with the same shape as input and type uint8 + * 0 - NDArray with the shape as {input.dim0,...input.dimLast/8} and type uint8 */ // #if NOT_EXCLUDED(OP_compare_and_bitpack) @Namespace("sd::ops") public static class compare_and_bitpack extends DeclarableCustomOp {