Attempt to fix windows build

karllessard · karllessard · commit beb5509e702e · 2024-02-24T10:07:50.000-05:00
diff --git a/tensorflow-core/tensorflow-core-native/pom.xml b/tensorflow-core/tensorflow-core-native/pom.xml
@@ -178,7 +178,7 @@
             </goals>
             <configuration>
               <skip>${dist.download.skip}</skip> <!-- skipped when full native build is enabled -->
-              <executable>/bin/bash</executable>
+              <executable>bash</executable>
               <arguments>
                 <argument>scripts/dist_download.sh</argument>
                 <argument>${dist.download.folder}</argument>
diff --git a/tensorflow-core/tensorflow-core-native/scripts/dist_download.sh b/tensorflow-core/tensorflow-core-native/scripts/dist_download.sh
@@ -17,12 +17,12 @@ case ${PLATFORM:-} in
   'macosx-arm64')
     DOWNLOAD_URL='https://files.pythonhosted.org/packages/d3/4b/ae9037ea22ba94eb2cf267e991384c3444f3e6142fa49923352b4ab73e14/tensorflow_macos-2.14.0-cp311-cp311-macosx_12_0_arm64.whl'
     ;;
-  'windows')
-    DOWNLOAD_URL='https://files.pythonhosted.org/packages/ad/6e/1bfe367855dd87467564f7bf9fa14f3b17889988e79598bc37bf18f5ffb6/tensorflow_intel-2.14.0-cp311-cp311-win_amd64.whl'
+  'windows-x86_64')
+    DOWNLOAD_URL='https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-windows-x86_64-2.14.0.zip'
     ;;
   *)
     echo "TensorFlow distribution for ${PLATFORM} is not supported for download"
-    return 1;
+    exit 1;
 esac
 
 mkdir -p "$DOWNLOAD_FOLDER"
@@ -33,13 +33,15 @@ if [ ! -f $DOWNLOADED_FILE ]; then
 fi
 unzip -q -u $DOWNLOADED_FILE
 
+mkdir -p tensorflow
 cd tensorflow
 if [[ "$PLATFORM" =~ "linux" ]]; then
   ln -fs libtensorflow_cc.so.2 libtensorflow_cc.so
   ln -fs libtensorflow_framework.so.2 libtensorflow_framework.so
-
 elif [[ "$PLATFORM" =~ "macosx" ]]; then
   ln -fs libtensorflow_cc.2.dylib libtensorflow_cc.dylib
   ln -fs libtensorflow_framework.2.dylib libtensorflow_framework.dylib
+elif [[ "$PLATFORM" =~ "windows" ]]; then
+  ln -fs ../lib/tensorflow.dll tensorflow.dll
 fi
 ls -l .
diff --git a/tensorflow-core/tensorflow-core-native/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java b/tensorflow-core/tensorflow-core-native/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java
@@ -134,17 +134,9 @@
             "vcomp140",
             "msvcr120",
             "libiomp5md",
-            "mklml",
-            "tensorflow_framework"
+            "mklml"
           },
-          link = {"tensorflow_cc@.2"}),
-      @Platform(
-          value = "windows-x86",
-          preloadpath = {
-            "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x86/Microsoft.VC140.CRT/",
-            "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x86/Microsoft.VC140.OpenMP/",
-            "C:/Program Files (x86)/Windows Kits/10/Redist/ucrt/DLLs/x86/"
-          }),
+          link = {"tensorflow"}),
       @Platform(
           value = "windows-x86_64",
           preloadpath = {
