From 8ccb499e73653c3f5866014617a33512385f63d3 Mon Sep 17 00:00:00 2001
From: Marc Rasi <marcrasi@google.com>
Date: Thu, 17 Dec 2020 14:17:12 -0800
Subject: [PATCH 1/2] add presubmit_build.sh that passes a flag to swiftpm if
 it is a stock toolchain

---
 docker/presubmit_build.sh | 43 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100755 docker/presubmit_build.sh

diff --git a/docker/presubmit_build.sh b/docker/presubmit_build.sh
new file mode 100755
index 00000000000..52f09fe01cd
--- /dev/null
+++ b/docker/presubmit_build.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+set -exuo pipefail
+
+sudo apt-get install -y docker.io
+
+# Sets 'swift_tf_url' to the public url corresponding to
+# 'swift_tf_bigstore_gfile', if it exists.
+if [[ ! -z ${swift_tf_bigstore_gfile+x} ]]; then
+  export swift_tf_url="${swift_tf_bigstore_gfile/\/bigstore/https://storage.googleapis.com}"
+  case "$swift_tf_url" in
+    *stock*) STOCK_TOOLCHAIN=YES ;;
+    *) ;;
+  esac
+fi
+
+# Help debug the job's disk space.
+df -h
+
+# Move docker images into /tmpfs, where there is more space.
+sudo /etc/init.d/docker stop
+sudo mv /var/lib/docker /tmpfs/
+sudo ln -s /tmpfs/docker /var/lib/docker
+sudo /etc/init.d/docker start
+
+# Help debug the job's disk space.
+df -h
+
+cd github/swift-models
+sudo -E docker build -t built-img -f docker/Dockerfile --build-arg swift_tf_url .
+
+# SwiftPM-based build.
+docker run built-img /bin/bash -c "
+swift build ${STOCK_TOOLCHAIN:+"-D -Xswiftc -D TENSORFLOW_USE_STANDARD_TOOLCHAIN"} ;
+swift test ${STOCK_TOOLCHAIN:+"-D -Xswiftc -D TENSORFLOW_USE_STANDARD_TOOLCHAIN"} ;
+"
+
+# CMake-based build.
+sudo docker run built-img /bin/bash -c "
+set -e;
+cmake -B /BinaryCache/tensorflow-swift-models -D CMAKE_BUILD_TYPE=Release -D CMAKE_Swift_COMPILER=/swift-tensorflow-toolchain/usr/bin/swiftc -G Ninja -S /swift-models;
+cmake --build /BinaryCache/tensorflow-swift-models --verbose;
+"

From 57d9cad43707a2eea5cd736c927006fa5f3d2c1e Mon Sep 17 00:00:00 2001
From: Marc Rasi <marcrasi@google.com>
Date: Thu, 17 Dec 2020 15:07:22 -0800
Subject: [PATCH 2/2] address comment

---
 docker/presubmit_build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/presubmit_build.sh b/docker/presubmit_build.sh
index 52f09fe01cd..341d743e9ea 100755
--- a/docker/presubmit_build.sh
+++ b/docker/presubmit_build.sh
@@ -31,8 +31,8 @@ sudo -E docker build -t built-img -f docker/Dockerfile --build-arg swift_tf_url
 
 # SwiftPM-based build.
 docker run built-img /bin/bash -c "
-swift build ${STOCK_TOOLCHAIN:+"-D -Xswiftc -D TENSORFLOW_USE_STANDARD_TOOLCHAIN"} ;
-swift test ${STOCK_TOOLCHAIN:+"-D -Xswiftc -D TENSORFLOW_USE_STANDARD_TOOLCHAIN"} ;
+swift build ${STOCK_TOOLCHAIN:+"-Xswiftc -D -Xswiftc TENSORFLOW_USE_STANDARD_TOOLCHAIN"} ;
+swift test ${STOCK_TOOLCHAIN:+"-Xswiftc -D -Xswiftc TENSORFLOW_USE_STANDARD_TOOLCHAIN"} ;
 "
 
 # CMake-based build.