From 831258059b4e28baa7516196f12e68920576a259 Mon Sep 17 00:00:00 2001 From: Ryan Nett Date: Wed, 21 Apr 2021 14:21:31 -0700 Subject: [PATCH 1/4] Skip export on windows Signed-off-by: Ryan Nett --- .github/workflows/ci.yml | 1 + tensorflow-core/tensorflow-core-api/build.sh | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4ef87ee112..563aebd7055 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -228,6 +228,7 @@ jobs: ) df -h wmic pagefile list /format:list + set "SKIP_EXPORT=true" echo Executing Maven %MAVEN_PHASE% call mvn clean %MAVEN_PHASE% -B -U -e -Djavacpp.platform=windows-x86_64 -Djavacpp.platform.extension=${{ matrix.ext }} -pl %NATIVE_BUILD_PROJECTS% -am -DstagingRepositoryId=${{ needs.prepare.outputs.stagingRepositoryId }} "-Dnative.build.flags=%BAZEL_CACHE%" if ERRORLEVEL 1 exit /b diff --git a/tensorflow-core/tensorflow-core-api/build.sh b/tensorflow-core/tensorflow-core-api/build.sh index 94d8abbfd20..c322d8e79fd 100755 --- a/tensorflow-core/tensorflow-core-api/build.sh +++ b/tensorflow-core/tensorflow-core-api/build.sh @@ -82,10 +82,15 @@ mkdir -p $GEN_SRCS_DIR GEN_RESOURCE_DIR=src/gen/resources/org/tensorflow/op mkdir -p $GEN_RESOURCE_DIR -# Export op defs -$BAZEL_BIN/java_op_exporter \ - --api_dirs=$BAZEL_SRCS/external/org_tensorflow/tensorflow/core/api_def/base_api,src/bazel/api_def \ - $TENSORFLOW_LIB > $GEN_RESOURCE_DIR/ops.pb +if [[ -z "$SKIP_EXPORT" ]]; then + # Export op defs + echo "Exporting Ops" + $BAZEL_BIN/java_op_exporter \ + --api_dirs=$BAZEL_SRCS/external/org_tensorflow/tensorflow/core/api_def/base_api,src/bazel/api_def \ + $TENSORFLOW_LIB > $GEN_RESOURCE_DIR/ops.pb +else + echo "Skiping Op export" +fi # Copy generated Java protos from source jars From 23fd8a1d4f1be3dcd2d2b68a2ad9b84787a79822 Mon Sep 17 00:00:00 2001 From: Ryan Nett Date: Wed, 21 Apr 2021 15:07:51 -0700 Subject: [PATCH 2/4] Fix typo Signed-off-by: Ryan Nett --- tensorflow-core/tensorflow-core-api/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow-core/tensorflow-core-api/build.sh b/tensorflow-core/tensorflow-core-api/build.sh index c322d8e79fd..c7940728137 100755 --- a/tensorflow-core/tensorflow-core-api/build.sh +++ b/tensorflow-core/tensorflow-core-api/build.sh @@ -89,7 +89,7 @@ if [[ -z "$SKIP_EXPORT" ]]; then --api_dirs=$BAZEL_SRCS/external/org_tensorflow/tensorflow/core/api_def/base_api,src/bazel/api_def \ $TENSORFLOW_LIB > $GEN_RESOURCE_DIR/ops.pb else - echo "Skiping Op export" + echo "Skipping Op export" fi From fddf2f7886785f05d4d3fd566ff25a4dd0c6b33b Mon Sep 17 00:00:00 2001 From: Ryan Nett Date: Wed, 21 Apr 2021 15:36:15 -0700 Subject: [PATCH 3/4] Fix script Signed-off-by: Ryan Nett --- tensorflow-core/tensorflow-core-api/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow-core/tensorflow-core-api/build.sh b/tensorflow-core/tensorflow-core-api/build.sh index c7940728137..32f6601ab4a 100755 --- a/tensorflow-core/tensorflow-core-api/build.sh +++ b/tensorflow-core/tensorflow-core-api/build.sh @@ -82,7 +82,7 @@ mkdir -p $GEN_SRCS_DIR GEN_RESOURCE_DIR=src/gen/resources/org/tensorflow/op mkdir -p $GEN_RESOURCE_DIR -if [[ -z "$SKIP_EXPORT" ]]; then +if [[ -z ${SKIP_EXPORT} ]]; then # Export op defs echo "Exporting Ops" $BAZEL_BIN/java_op_exporter \ From 20c1e7aff93159673fb3c4ff5d05a525a39b160d Mon Sep 17 00:00:00 2001 From: Ryan Nett Date: Wed, 21 Apr 2021 16:04:04 -0700 Subject: [PATCH 4/4] Fix script for real Signed-off-by: Ryan Nett --- tensorflow-core/tensorflow-core-api/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow-core/tensorflow-core-api/build.sh b/tensorflow-core/tensorflow-core-api/build.sh index 32f6601ab4a..b1c5194214f 100755 --- a/tensorflow-core/tensorflow-core-api/build.sh +++ b/tensorflow-core/tensorflow-core-api/build.sh @@ -82,7 +82,7 @@ mkdir -p $GEN_SRCS_DIR GEN_RESOURCE_DIR=src/gen/resources/org/tensorflow/op mkdir -p $GEN_RESOURCE_DIR -if [[ -z ${SKIP_EXPORT} ]]; then +if [[ -z "${SKIP_EXPORT:-}" ]]; then # Export op defs echo "Exporting Ops" $BAZEL_BIN/java_op_exporter \