From 228cfbe83f5d3e82481ee7bc040cde88288c851e Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 20 Apr 2022 17:07:16 -0400 Subject: [PATCH 1/5] migrate test_cc from conda to docker --- .github/workflows/test_cc.yml | 6 +++++- source/install/codecov.sh | 11 +++++++++++ source/install/test_cc.sh | 4 ---- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100755 source/install/codecov.sh diff --git a/.github/workflows/test_cc.yml b/.github/workflows/test_cc.yml index 5192eda6e9..fede963214 100644 --- a/.github/workflows/test_cc.yml +++ b/.github/workflows/test_cc.yml @@ -6,6 +6,10 @@ jobs: testpython: name: Test C++ runs-on: ubuntu-latest + container: floopcz/tensorflow_cc:ubuntu steps: - uses: actions/checkout@master - - run: source/install/test_cc.sh + - run: source/install/test_cc_local.sh + env: + tensorflow_root: /usr/local + - run: source/install/codecov.sh diff --git a/source/install/codecov.sh b/source/install/codecov.sh new file mode 100755 index 0000000000..e82f68be35 --- /dev/null +++ b/source/install/codecov.sh @@ -0,0 +1,11 @@ +set -e + +#------------------ + +SCRIPT_PATH=$(dirname $(realpath -s $0)) + +#------------------ +# upload to codecov +cd ${SCRIPT_PATH} +bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports" + diff --git a/source/install/test_cc.sh b/source/install/test_cc.sh index 6b07b802ba..58fa86eb10 100755 --- a/source/install/test_cc.sh +++ b/source/install/test_cc.sh @@ -34,8 +34,4 @@ make install cd ${SCRIPT_PATH}/../api_cc/tests ${INSTALL_PREFIX}/bin/runUnitTests -#------------------ -# upload to codecov -cd ${SCRIPT_PATH} -bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports" From 8a0a4ab9cbc42644d18dd8516532577f4ed18b8f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 20 Apr 2022 17:33:41 -0400 Subject: [PATCH 2/5] change image --- .github/workflows/test_cc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_cc.yml b/.github/workflows/test_cc.yml index fede963214..02b41c096c 100644 --- a/.github/workflows/test_cc.yml +++ b/.github/workflows/test_cc.yml @@ -6,7 +6,7 @@ jobs: testpython: name: Test C++ runs-on: ubuntu-latest - container: floopcz/tensorflow_cc:ubuntu + container: ghcr.io/deepmodeling/libtensorflow_cc:latest steps: - uses: actions/checkout@master - run: source/install/test_cc_local.sh From 913a3d06ec07655726381677ca8e14c4034db724 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Thu, 21 Apr 2022 04:39:23 -0400 Subject: [PATCH 3/5] update image --- .github/workflows/test_cc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_cc.yml b/.github/workflows/test_cc.yml index 02b41c096c..ff54569554 100644 --- a/.github/workflows/test_cc.yml +++ b/.github/workflows/test_cc.yml @@ -6,7 +6,7 @@ jobs: testpython: name: Test C++ runs-on: ubuntu-latest - container: ghcr.io/deepmodeling/libtensorflow_cc:latest + container: ghcr.io/deepmodeling/deepmd-kit-test-cc:latest steps: - uses: actions/checkout@master - run: source/install/test_cc_local.sh From 66b135e6e08177fbc4c6256605d937707aa263b7 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Fri, 22 Apr 2022 00:35:06 -0400 Subject: [PATCH 4/5] set CXX_STANDARD before add_library --- source/api_cc/tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/api_cc/tests/CMakeLists.txt b/source/api_cc/tests/CMakeLists.txt index bd7c23a5a3..5609f0a8f2 100644 --- a/source/api_cc/tests/CMakeLists.txt +++ b/source/api_cc/tests/CMakeLists.txt @@ -36,7 +36,6 @@ set(opname "deepmd_op") set(OP_BASE_DIR ${CMAKE_SOURCE_DIR}/../../op) # file(GLOB OP_SRC ${OP_BASE_DIR}/*.cc) file(GLOB OP_SRC ${OP_BASE_DIR}/custom_op.cc ${OP_BASE_DIR}/prod_force.cc ${OP_BASE_DIR}/prod_virial.cc ${OP_BASE_DIR}/descrpt.cc ${OP_BASE_DIR}/descrpt_se_a_ef.cc ${OP_BASE_DIR}/descrpt_se_a_ef.cc ${OP_BASE_DIR}/descrpt_se_a_ef_para.cc ${OP_BASE_DIR}/descrpt_se_a_ef_vert.cc ${OP_BASE_DIR}/pair_tab.cc ${OP_BASE_DIR}/prod_force_multi_device.cc ${OP_BASE_DIR}/prod_virial_multi_device.cc ${OP_BASE_DIR}/soft_min.cc ${OP_BASE_DIR}/soft_min_force.cc ${OP_BASE_DIR}/soft_min_virial.cc ${OP_BASE_DIR}/ewald_recp.cc ${OP_BASE_DIR}/gelu_multi_device.cc ${OP_BASE_DIR}/map_aparam.cc ${OP_BASE_DIR}/neighbor_stat.cc ${OP_BASE_DIR}/unaggregated_grad.cc ${OP_BASE_DIR}/tabulate_multi_device.cc ${OP_BASE_DIR}/prod_env_mat_multi_device.cc) -add_library(${opname} SHARED ${OP_SRC}) list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../cmake/) find_package(tensorflow REQUIRED) @@ -46,6 +45,7 @@ else() set (CMAKE_CXX_STANDARD 11) endif() include_directories(${TensorFlow_INCLUDE_DIRS}) +add_library(${opname} SHARED ${OP_SRC}) find_package(Threads) # find openmp From d7c3b64b63f45cbe08a56ee16a27a2713d6f72d3 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Fri, 22 Apr 2022 00:47:28 -0400 Subject: [PATCH 5/5] use bash instead of sh --- source/install/codecov.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/source/install/codecov.sh b/source/install/codecov.sh index e82f68be35..9a4b7ee29a 100755 --- a/source/install/codecov.sh +++ b/source/install/codecov.sh @@ -1,3 +1,4 @@ +#!/bin/bash set -e #------------------