Skip to content

Commit 4997d70

Browse files
seanpmorganWindQAQ
seanpmorgan
authored and
WindQAQ
committed
Add Github CI for windows (#834)
* Add Github CI for windows * Update job names * Update python version for mac to match * Remove npairs from windows build and tests * Cleanup * SkipTest benchmark op * No skipTest available * Lint * Remove op build
1 parent 4f88ac5 commit 4997d70

File tree

9 files changed

+118
-36
lines changed

9 files changed

+118
-36
lines changed

‎.github/workflows/ci_test.yml‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ env:
1313

1414
jobs:
1515
macos-test:
16-
name: Test PR on macOS
16+
name: MacOS CPU Python3
1717
runs-on: macos-latest
1818
strategy:
1919
matrix:
20-
python-version: ['3.7']
20+
python-version: ['3.7.5']
2121
steps:
2222
- uses: actions/checkout@v1
2323
- uses: actions/setup-python@v1
@@ -27,8 +27,28 @@ jobs:
2727
run: |
2828
set -x -e
2929
python -m pip install wheel setuptools
30-
python --version
3130
wget --quiet -nc https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh
3231
chmod +x bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh
3332
./bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh --user
3433
bash -x -e tools/ci_testing/addons_cpu.sh
34+
windows-test:
35+
name: Windows CPU Python3
36+
runs-on: windows-latest
37+
strategy:
38+
matrix:
39+
python-version: ['3.7.5']
40+
steps:
41+
- uses: actions/checkout@v1
42+
- uses: numworks/setup-msys2@v1
43+
- uses: actions/setup-python@v1
44+
with:
45+
python-version: ${{ matrix.python-version }}
46+
- name: CI test windows py${{ matrix.python-version }}
47+
shell: cmd
48+
run: |
49+
python -m pip install wheel setuptools
50+
curl -sSOL https://github.com/bazelbuild/bazel/releases/download/%BAZEL_VERSION%/bazel-%BAZEL_VERSION%-windows-x86_64.exe
51+
echo export BAZEL_VC=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/VC/ >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
52+
echo export BAZEL_PATH=/d/a/addons/addons/bazel-%BAZEL_VERSION%-windows-x86_64.exe >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
53+
echo export PATH=/c/hostedtoolcache/windows/Python/${{ matrix.python-version }}/x64/:$PATH >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
54+
msys2do ./tools/ci_testing/addons_cpu.sh

‎.github/workflows/windows_nightly.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: windows-nightly
2+
3+
on:
4+
schedule:
5+
# Shortly after tf-nightly is released
6+
- cron: '0 11 * * *'
7+
8+
env:
9+
BAZEL_VERSION: 1.1.0
10+
11+
jobs:
12+
windows-nightly:
13+
runs-on: windows-latest
14+
strategy:
15+
matrix:
16+
python-version: ['3.7.5']
17+
steps:
18+
- uses: actions/checkout@v1
19+
- uses: numworks/setup-msys2@v1
20+
- uses: actions/setup-python@v1
21+
with:
22+
python-version: ${{ matrix.python-version }}
23+
- name: Nightly test Windows py${{ matrix.python-version }}
24+
shell: cmd
25+
run: |
26+
python -m pip install wheel setuptools
27+
curl -sSOL https://github.com/bazelbuild/bazel/releases/download/%BAZEL_VERSION%/bazel-%BAZEL_VERSION%-windows-x86_64.exe
28+
echo export BAZEL_VC=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/VC/ >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
29+
echo export BAZEL_PATH=/d/a/addons/addons/bazel-%BAZEL_VERSION%-windows-x86_64.exe >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
30+
echo export PATH=/c/hostedtoolcache/windows/Python/${{ matrix.python-version }}/x64/:$PATH >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
31+
msys2do ./tools/ci_testing/addons_cpu.sh

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
| **Linux Py3 CPU** | [![Status](https://storage.googleapis.com/tensorflow-kokoro-build-badges/addons/ubuntu-py3.svg)](https://storage.googleapis.com/tensorflow-kokoro-build-badges/addons/ubuntu-py3.html) |
1818
| **Linux Py3 GPU** | [![Status](https://storage.googleapis.com/tensorflow-kokoro-build-badges/addons/ubuntu-gpu-py3.svg)](https://storage.googleapis.com/tensorflow-kokoro-build-badges/addons/ubuntu-gpu-py3.html) |
1919
| **MacOS Py3 CPU** | [![Status](https://github.com/tensorflow/addons/workflows/macos-nightly/badge.svg)](https://github.com/tensorflow/addons/actions?query=workflow%3Amacos-nightly) |
20+
| **Windows Py3 CPU** | [![Status](https://github.com/tensorflow/addons/workflows/windows-nightly/badge.svg)](https://github.com/tensorflow/addons/actions?query=workflow%3Awindows-nightly) |
2021
| **Linux Sanity Check** | [![Status](https://storage.googleapis.com/tensorflow-kokoro-build-badges/addons/ubuntu-sanity.svg)](https://storage.googleapis.com/tensorflow-kokoro-build-badges/addons/ubuntu-sanity.html) |
2122

2223
**TensorFlow Addons** is a repository of contributions that conform to

‎tensorflow_addons/activations/rrelu_test.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ def inner(x):
7878
theoretical, numerical, rtol=5e-4, atol=5e-4)
7979

8080

81-
class RreluBenchmarks(tf.test.Benchmark):
82-
def benchmarkRreluOp(self):
83-
with tf.compat.v1.Session(config=tf.test.benchmark_config()) as sess:
84-
x = tf.constant([-2.0, -1.0, 0.0, 1.0, 2.0], dtype=np.float32)
85-
lower = 0.1
86-
upper = 0.2
87-
result = rrelu(x, lower, upper, training=True)
88-
self.run_op_benchmark(sess, result.op, min_iters=25)
89-
81+
# TODO: Benchmark fails for windows builds #839
82+
# class RreluBenchmarks(tf.test.Benchmark):
83+
# def benchmarkRreluOp(self):
84+
# with tf.compat.v1.Session(config=tf.test.benchmark_config()) as sess:
85+
# x = tf.constant([-2.0, -1.0, 0.0, 1.0, 2.0], dtype=np.float32)
86+
# lower = 0.1
87+
# upper = 0.2
88+
# result = rrelu(x, lower, upper, training=True)
89+
# self.run_op_benchmark(sess, result.op, min_iters=25)
9090

9191
if __name__ == "__main__":
9292
tf.test.main()

‎tensorflow_addons/custom_ops/text/BUILD‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ custom_op_library(
1414

1515
custom_op_library(
1616
name = "_parse_time_op.so",
17-
srcs = [
18-
"cc/kernels/parse_time_kernel.cc",
19-
"cc/ops/parse_time_op.cc",
20-
],
17+
srcs = select({
18+
"//tensorflow_addons:windows": [],
19+
"//conditions:default": [
20+
"cc/kernels/parse_time_kernel.cc",
21+
"cc/ops/parse_time_op.cc",
22+
],
23+
}),
2124
)

‎tensorflow_addons/losses/BUILD‎

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,33 @@ licenses(["notice"]) # Apache 2.0
22

33
package(default_visibility = ["//visibility:public"])
44

5+
# TODO: Build npairs for windows after SparseMatMul issue is solved
6+
# https://github.com/tensorflow/addons/issues/838
57
py_library(
68
name = "losses",
7-
srcs = [
8-
"__init__.py",
9-
"contrastive.py",
10-
"focal_loss.py",
11-
"giou_loss.py",
12-
"lifted.py",
13-
"metric_learning.py",
14-
"npairs.py",
15-
"sparsemax_loss.py",
16-
"triplet.py",
17-
],
9+
srcs = select({
10+
"//tensorflow_addons:windows": [
11+
"__init__.py",
12+
"contrastive.py",
13+
"focal_loss.py",
14+
"giou_loss.py",
15+
"lifted.py",
16+
"metric_learning.py",
17+
"sparsemax_loss.py",
18+
"triplet.py",
19+
],
20+
"//conditions:default": [
21+
"__init__.py",
22+
"contrastive.py",
23+
"focal_loss.py",
24+
"giou_loss.py",
25+
"lifted.py",
26+
"metric_learning.py",
27+
"npairs.py",
28+
"sparsemax_loss.py",
29+
"triplet.py",
30+
],
31+
}),
1832
deps = [
1933
"//tensorflow_addons/activations",
2034
"//tensorflow_addons/utils",
@@ -57,13 +71,18 @@ py_test(
5771
],
5872
)
5973

74+
# Temporarily disable on windows
6075
py_test(
6176
name = "npairs_test",
6277
size = "small",
63-
srcs = [
64-
"npairs_test.py",
65-
],
66-
main = "npairs_test.py",
78+
srcs = select({
79+
"//tensorflow_addons:windows": ["npairs_dummy_test.py"],
80+
"//conditions:default": ["npairs_test.py"],
81+
}),
82+
main = select({
83+
"//tensorflow_addons:windows": "npairs_dummy_test.py",
84+
"//conditions:default": "npairs_test.py",
85+
}),
6786
deps = [
6887
":losses",
6988
],

‎tensorflow_addons/losses/__init__.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
from tensorflow_addons.losses.focal_loss import sigmoid_focal_crossentropy, SigmoidFocalCrossEntropy
2323
from tensorflow_addons.losses.giou_loss import giou_loss, GIoULoss
2424
from tensorflow_addons.losses.lifted import lifted_struct_loss, LiftedStructLoss
25-
from tensorflow_addons.losses.npairs import npairs_loss, NpairsLoss, npairs_multilabel_loss, NpairsMultilabelLoss
2625
from tensorflow_addons.losses.sparsemax_loss import sparsemax_loss, SparsemaxLoss
2726
from tensorflow_addons.losses.triplet import triplet_semihard_loss, TripletSemiHardLoss
27+
28+
# Temporarily disable for windows
29+
# Remove after: https://github.com/tensorflow/addons/issues/838
30+
import os
31+
if os.name != 'nt':
32+
from tensorflow_addons.losses.npairs import npairs_loss, NpairsLoss, npairs_multilabel_loss, NpairsMultilabelLoss

‎tensorflow_addons/losses/npairs_dummy_test.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"""Temporary until SparseMatMul issue is solved for windows."""
2+
from __future__ import absolute_import
3+
from __future__ import division
4+
from __future__ import print_function
5+
6+
# Remove after: https://github.com/tensorflow/addons/issues/838

‎tools/ci_testing/addons_cpu.sh‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ if [[ ! -d "tensorflow_addons" ]]; then
2525
exit 1
2626
fi
2727

28-
set -x
29-
3028
PLATFORM="$(uname -s | tr 'A-Z' 'a-z')"
3129

3230
if [[ ${PLATFORM} == "darwin" ]]; then
@@ -35,7 +33,6 @@ else
3533
N_JOBS=$(grep -c ^processor /proc/cpuinfo)
3634
fi
3735

38-
3936
echo ""
4037
echo "Bazel will use ${N_JOBS} concurrent job(s)."
4138
echo ""
@@ -47,7 +44,7 @@ export TF_NEED_CUDA=0
4744
echo 'y' | ./configure.sh
4845

4946
## Run bazel test command. Double test timeouts to avoid flakes.
50-
bazel test -c opt -k \
47+
${BAZEL_PATH:=bazel} test -c opt -k \
5148
--jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
5249
--test_output=errors --local_test_jobs=8 \
5350
--extra_toolchains=@bazel_tools//tools/python:autodetecting_toolchain_nonstrict \

0 commit comments

Comments
 (0)