Skip to content

Commit b445865

Browse files
committed
Update travis CI and remove build log for bazel.
1 parent 03acb83 commit b445865

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ jobs:
6262
- stage: Unit Test
6363
script:
6464
- echo "Ops Test On Darwin"
65-
- python tools/bazel_adb_run.py --target="//test/ccunit:mace_cc_test" --run_target=False --enable_openmp=false --target_abis=host || exit 1;
66-
- bazel build "//test/ccunit:mace_cc_test" --config=ios --config=optimization_darwin --define openmp=false --define quantize=true --define neon=true --config symbol_hidden || exit 1;
65+
- python tools/bazel_adb_run.py --target="//test/ccunit:mace_cc_test" --run_target=False --target_abis=host || exit 1;
66+
- bazel build "//test/ccunit:mace_cc_test" --config=ios --config=optimization_darwin --define quantize=true --define neon=true --config symbol_hidden || exit 1;
6767
env: TYPE=Ops-Test
6868
os: osx
6969
osx_image: xcode7.2
7070
- stage: Unit Test
7171
script:
7272
- echo "Ops Test Without NEON"
73-
- python tools/bazel_adb_run.py --target="//test/ccunit:mace_cc_test" --run_target=False --target_abis=armeabi-v7a,arm64-v8a,arm64 --enable_neon=false || exit 1
73+
- python tools/bazel_adb_run.py --target="//test/ccunit:mace_cc_test" --run_target=False --target_abis=armeabi-v7a,arm64-v8a,arm64 --enable_neon=false --enable_quantize=false || exit 1
7474
env: TYPE=Ops-Test-Without-NEON
7575
os: linux
7676
dist: xenial
@@ -90,8 +90,8 @@ jobs:
9090
osx_image: xcode7.2
9191
- stage: Unit Test
9292
script:
93-
- python tools/bazel_adb_run.py --target="//test/ccbenchmark:mace_cc_benchmark" --run_target=False --enable_openmp=false --target_abis=host || exit 1;
94-
- bazel build "//test/ccbenchmark:mace_cc_benchmark" --config=ios --config=optimization_darwin --define openmp=false --define quantize=true --define neon=true --config symbol_hidden || exit 1;
93+
- python tools/bazel_adb_run.py --target="//test/ccbenchmark:mace_cc_benchmark" --run_target=False --target_abis=host || exit 1;
94+
- bazel build "//test/ccbenchmark:mace_cc_benchmark" --config=ios --config=optimization_darwin --define quantize=true --define neon=true --config symbol_hidden || exit 1;
9595
env: TYPE=Ops-Benchmark
9696
os: osx
9797
osx_image: xcode7.2
@@ -115,15 +115,15 @@ jobs:
115115
sudo: required
116116
- stage: Extra Test
117117
script:
118-
- bazel build "//mace/libmace:libmace_static" --config=darwin --config=optimization_darwin --define openmp=false --define quantize=true --config symbol_hidden || exit 1;
119-
- bazel build "//mace/libmace:libmace_dynamic" --config=darwin --config=optimization_darwin --define openmp=false --define quantize=true --config symbol_hidden || exit 1;
118+
- bazel build "//mace/libmace:libmace_static" --config=darwin --config=optimization_darwin --define quantize=true --config symbol_hidden || exit 1;
119+
- bazel build "//mace/libmace:libmace_dynamic" --config=darwin --config=optimization_darwin --define quantize=true --config symbol_hidden || exit 1;
120120
env: TYPE=Build-Library
121121
os: osx
122122
osx_image: xcode7.2
123123
- stage: Extra Test
124124
script:
125-
- bazel build "//mace/libmace:libmace_static" --config=ios --config=optimization_darwin --define openmp=false --define quantize=true --define neon=true --config symbol_hidden || exit 1;
126-
- bazel build "//mace/libmace:libmace_dynamic" --config=ios --config=optimization_darwin --define openmp=false --define quantize=true --define neon=true --config symbol_hidden || exit 1;
125+
- bazel build "//mace/libmace:libmace_static" --config=ios --config=optimization_darwin --define quantize=true --define neon=true --config symbol_hidden || exit 1;
126+
- bazel build "//mace/libmace:libmace_dynamic" --config=ios --config=optimization_darwin --define quantize=true --define neon=true --config symbol_hidden || exit 1;
127127
env: TYPE=Build-Library
128128
os: osx
129129
osx_image: xcode7.2

mace/codegen/tools/gen_version_source.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
mkdir -p $(dirname $OUTPUT_FILENAME)
2323

2424
MACE_SOURCE_DIR=$(dirname $(dirname $(dirname $(dirname $0))))
25-
GIT_VERSION=$(git --git-dir=${MACE_SOURCE_DIR}/.git --work-tree=${MACE_SOURCE_DIR} describe --long --tags)
25+
GIT_VERSION=$(git --git-dir=${MACE_SOURCE_DIR}/.git --work-tree=${MACE_SOURCE_DIR} describe --long --tags --abbrev=7)
2626

2727
if [[ $? != 0 ]]; then
2828
GIT_VERSION=$(git describe --long --tags)

tools/bazel.rc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# By default, we don't distinct target and host platfroms.
44
build --distinct_host_configuration=false
55

6-
build -s
76
build --verbose_failures
87
build --copt=-std=c++11
98
build --copt=-fPIC

tools/bazel_adb_run.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ def parse_args():
8989
default=True,
9090
help="Whether to use neon optimization")
9191
parser.add_argument(
92-
"--enable_openmp",
92+
"--enable_quantize",
9393
type=str2bool,
94-
default=False,
95-
help="Whether to use openmp")
94+
default=True,
95+
help="Whether to use quantization ops")
9696
parser.add_argument(
9797
'--address_sanitizer',
9898
action="store_true",
@@ -127,7 +127,7 @@ def main(unused_args):
127127
abi=target_abi,
128128
toolchain=toolchain,
129129
enable_neon=FLAGS.enable_neon,
130-
enable_openmp=FLAGS.enable_openmp,
130+
enable_quantize=FLAGS.enable_quantize,
131131
address_sanitizer=FLAGS.address_sanitizer,
132132
debug_mode=FLAGS.debug_mode)
133133
if FLAGS.run_target:

0 commit comments

Comments
 (0)