Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 200b284

Browse files
josephevansbarry-jinyajiedesign
authored
[v1.9.x] Port #20709 to v1.9.x branch (#20722)
* [v1.x] License updates (#20709) * Remove Apache-2.0 license header from ONNX files that were originally BSD 3-clause licensed and properly list then under BSD 3-clause section in LICENSE. * Remove 3rdparty/mkldnn/src/common/primitive_hashing.hpp from LICENSE under Boost License section, since it is clearly Apache 2.0 licensed. * Clarify Caffe license to BSD 2-clause with Caffe extensions. * Clarify Caffe license to BSD 2-clause with Caffe extensions. * Remove duplicate file, should only be in BSD 3-clause section. * Update LICENSE with latest from 3rdparty/mkldnn/THIRD-PARTY-PROGRAMS * Sort files under MIT license. Remove references to generic licenses. * Remove incorrectly added Apache header on MIT-licensed files. * Sort lines in ASF-2.0 licensed list. * Add license text in licenses/ to fulfill binary distribution requirements. * Remove copyright by contributors line from ASF-licensed file. * Fix rat-excludes and licensecheck exclude list. * Error out and fail if license_header.py tool detects multiple licenses in a file. * Move LayerNormCPUKernel function to own file, since it is licensed under MIT. Update LICENSE to reflect this. * Remove LayerNormCPUKernel from layer_norm.cc, it is now in layer_norm_cpu.h. * Add header guard, fix first line to pass lint. * Update skywalking-eyes config based on current LICENSE, add layer_norm_cpu.h to whitelist. * Rename license file for layer_norm_cpu.h * Update mkldnn license text and LICENSE. * [v1.x] Port #20648, #20676, #19236 to v1.x (#20677) * [v1.9.x] CI fixes (#20648) * Update openssl package in ubuntu_core.sh (used in ubuntu 16.04 images) to avoid bug triggered by let's encrypt expired ca cert. * Reduce number of parallel docker builds we run at once to 2, since there are multiple jobs (on different branches) running at the same time. * Use different mirror to download binutils to avoid expired let's encrypt CA cert. * [CI] UPgrade windows CI * fix python 3.8 ctypes dll load with windows (#19236) Co-authored-by: barry-jin <[email protected]> Co-authored-by: Hu Shiwen <[email protected]> * Remove general license text files, as this is included in individual license files in licenses/*. Update license for code contributed/derived from https://github.com/msracver/Deformable-ConvNets which is now MIT licensed and update LICENSE to reflect this. Add references for original code with github revision to MIT-licensed files. * Fix rat-excludes. * Update skywalking-eyes config. Co-authored-by: barry-jin <[email protected]> Co-authored-by: Hu Shiwen <[email protected]>
1 parent 5cd2d4d commit 200b284

File tree

68 files changed

+3646
-360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+3646
-360
lines changed

.licenserc.yaml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ header:
4141
- 'src/operator/contrib/multi_proposal-inl.h'
4242
- 'src/operator/contrib/multi_proposal.cc'
4343
- 'src/operator/contrib/multi_proposal.cu'
44+
- 'src/operator/contrib/psroi_pooling-inl.h'
4445
- 'src/operator/contrib/psroi_pooling.cc'
4546
- 'src/operator/contrib/psroi_pooling.cu'
4647
- 'src/operator/nn/mkldnn/mkldnn_base-inl.h'
@@ -49,25 +50,30 @@ header:
4950
- 'cmake/Modules/FindJeMalloc.cmake'
5051
# files licensed under bsd 2-clause
5152
- 'example/ssd/dataset/pycocotools/coco.py'
53+
# files licensed under bsd 2-clause + caffe
54+
- 'src/operator/nn/pool.cuh'
55+
- 'src/operator/nn/pool.h'
56+
- 'src/operator/nn/im2col.cuh'
57+
- 'src/operator/nn/im2col.h'
58+
- 'src/operator/contrib/nn/deformable_im2col.cuh'
59+
- 'src/operator/contrib/nn/deformable_im2col.h'
60+
- 'src/operator/contrib/nn/modulated_deformable_im2col.cuh'
61+
- 'src/operator/contrib/nn/modulated_deformable_im2col.h'
5262
# files licensed under bsd 3-clause
5363
- 'cmake/upstream/FindCUDAToolkit.cmake'
5464
- 'cmake/upstream/select_compute_arch.cmake'
65+
- 'python/mxnet/onnx/mx2onnx/_export_onnx.py'
66+
- 'python/mxnet/onnx/mx2onnx/_op_translations/_op_translations_opset12.py'
67+
- 'python/mxnet/onnx/mx2onnx/_op_translations/_op_translations_opset13.py'
5568
- 'src/operator/contrib/erfinv-inl.h'
5669
- 'src/operator/numpy/np_einsum_op-inl.h'
5770
- 'src/operator/numpy/np_einsum_op.cc'
5871
- 'src/operator/numpy/np_einsum_path_op-inl.h'
59-
# files licensed under caffe/mit license
72+
# files licensed under mit license
6073
- 'src/operator/contrib/modulated_deformable_convolution-inl.h'
6174
- 'src/operator/contrib/modulated_deformable_convolution.cc'
6275
- 'src/operator/contrib/modulated_deformable_convolution.cu'
63-
- 'src/operator/contrib/nn/deformable_im2col.cuh'
64-
- 'src/operator/contrib/nn/deformable_im2col.h'
65-
- 'src/operator/contrib/nn/modulated_deformable_im2col.cuh'
66-
- 'src/operator/contrib/nn/modulated_deformable_im2col.h'
67-
- 'src/operator/nn/im2col.cuh'
68-
- 'src/operator/nn/im2col.h'
69-
- 'src/operator/nn/pool.cuh'
70-
- 'src/operator/nn/pool.h'
76+
- 'src/operator/nn/layer_norm_cpu.h'
7177
# symlinks
7278
- 'include/dlpack' # symlink to 3rdparty/dlpack/include/dlpack
7379
- 'include/dmlc' # symlink to 3rdparty/dmlc-core/include/dmlc

LICENSE

Lines changed: 52 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,7 @@
207207
The Apache MXNET (incubating) project contains subcomponents with separate
208208
copyright notices and license terms. Your use of the source code for the
209209
these subcomponents is subject to the terms and conditions of the following
210-
licenses. If not stated otherwise, their copyright notices and license terms
211-
are available at the path of the subcomponent.
210+
licenses. See licenses/ for text of these licenses.
212211

213212
If a folder hierarchy is listed as subcomponent, separate listings of
214213
further subcomponents (files or folder hierarchies) part of the hierarchy
@@ -220,60 +219,67 @@
220219

221220
3rdparty/ctc_include
222221
3rdparty/dlpack
223-
include/dlpack (header symlinks to 3rdparty/dlpack/include/dlpack)
224222
3rdparty/dmlc-core
225-
include/dmlc (header symlinks to 3rdparty/dmlc-core/include/dmlc)
223+
3rdparty/googletest/googlemock/scripts/generator
226224
3rdparty/mshadow
227-
include/mshadow (header symlinks to 3rdparty/mshadow/mshadow)
228-
3rdparty/tvm
229-
3rdparty/tvm/3rdparty/dmlc-core
230-
3rdparty/tvm/3rdparty/dlpack
231-
include/nnvm (header symlinks to 3rdparty/tvm/nnvm/include/nnvm)
232-
3rdparty/ps-lite
233225
3rdparty/mkldnn
234-
include/mkldnn (header symlinks to 3rdparty/mkldnn)
235-
3rdparty/googletest/googlemock/scripts/generator
226+
3rdparty/mkldnn/doc/assets/mathjax
227+
3rdparty/mkldnn/tests/benchdnn
228+
3rdparty/mkldnn/cmake/FindComputeCpp.cmake (see licenses/LICENSE.mkldnn.txt)
236229
3rdparty/onnx-tensorrt/third_party/onnx/third_party/benchmark
237230
3rdparty/onnx-tensorrt/third_party/onnx/tools/protoc-gen-mypy.py
238-
3rdparty/mkldnn/tests/benchdnn (Copy of the License available at top of current file)
239-
src/operator/special_functions-inl.h Cephes Library Functions (Copy of the License available at top of current file)
240-
3rdparty/mkldnn/doc/assets/mathjax (Copy of the License available at top of current file)
241-
3rdparty/tvm/3rdparty/bfloat16/bfloat16.cc (Copy of the License available at top of current file)
242-
src/operator/contrib/deformable_convolution-inl.h
243-
src/operator/contrib/deformable_convolution.cc
244-
src/operator/contrib/deformable_convolution.cu
245-
src/operator/contrib/deformable_psroi_pooling-inl.h
246-
src/operator/contrib/deformable_psroi_pooling.cc
247-
src/operator/contrib/deformable_psroi_pooling.cu
231+
3rdparty/ps-lite
232+
3rdparty/tvm
233+
3rdparty/tvm/3rdparty/dlpack
234+
3rdparty/tvm/3rdparty/dmlc-core
235+
3rdparty/tvm/3rdparty/bfloat16/bfloat16.cc
236+
include/dlpack (header symlinks to 3rdparty/dlpack/include/dlpack)
237+
include/dmlc (header symlinks to 3rdparty/dmlc-core/include/dmlc)
238+
include/mkldnn (header symlinks to 3rdparty/mkldnn)
239+
include/mshadow (header symlinks to 3rdparty/mshadow/mshadow)
240+
include/nnvm (header symlinks to 3rdparty/tvm/nnvm/include/nnvm)
248241
src/operator/contrib/multi_proposal-inl.h
249242
src/operator/contrib/multi_proposal.cc
250243
src/operator/contrib/multi_proposal.cu
251-
src/operator/contrib/psroi_pooling.cc
252-
src/operator/contrib/psroi_pooling.cu
253244
src/operator/nn/mkldnn/mkldnn_base-inl.h
245+
src/operator/special_functions-inl.h
254246

255247
=======================================================================================
256248
MIT license
257249
=======================================================================================
258250

259-
example/gluon/tree_lstm
260-
3rdparty/tvm/3rdparty/cma
251+
3rdparty/intgemm
252+
3rdparty/mkldnn/src/gpu/jit/ngen/npack/elf_structs.hpp (see licenses/LICENSE.mkldnn.txt)
253+
3rdparty/mkldnn/src/gpu/jit/ngen/npack/hash.hpp (see licenses/LICENSE.mkldnn.txt)
261254
3rdparty/onnx-tensorrt
262255
3rdparty/onnx-tensorrt/third_party/onnx
263-
3rdparty/intgemm
256+
3rdparty/tvm/3rdparty/cma
264257
3rdparty/tvm/3rdparty/compiler-rt/builtin_fp16.h
265-
src/operator/contrib/modulated_deformable_convolution-inl.h
266-
src/operator/contrib/modulated_deformable_convolution.cc
267-
src/operator/contrib/modulated_deformable_convolution.cu
258+
example/gluon/tree_lstm
259+
src/operator/contrib/deformable_convolution-inl.h (see licenses/LICENSE.deformable_convnets.txt)
260+
src/operator/contrib/deformable_convolution.cc (see licenses/LICENSE.deformable_convnets.txt)
261+
src/operator/contrib/deformable_convolution.cu (see licenses/LICENSE.deformable_convnets.txt)
262+
src/operator/contrib/deformable_psroi_pooling-inl.h (see licenses/LICENSE.deformable_convnets.txt)
263+
src/operator/contrib/deformable_psroi_pooling.cc (see licenses/LICENSE.deformable_convnets.txt)
264+
src/operator/contrib/deformable_psroi_pooling.cu (see licenses/LICENSE.deformable_convnets.txt)
265+
src/operator/contrib/modulated_deformable_convolution-inl.h (see licenses/LICENSE.deformable_convnets.txt)
266+
src/operator/contrib/modulated_deformable_convolution.cc (see licenses/LICENSE.deformable_convnets.txt)
267+
src/operator/contrib/modulated_deformable_convolution.cu (see licenses/LICENSE.deformable_convnets.txt)
268+
src/operator/contrib/psroi_pooling-inl.h (see licenses/LICENSE.deformable_convnets.txt)
269+
src/operator/contrib/psroi_pooling.cc (see licenses/LICENSE.deformable_convnets.txt)
270+
src/operator/contrib/psroi_pooling.cu (see licenses/LICENSE.deformable_convnets.txt)
271+
src/operator/nn/layer_norm_cpu.h
268272

269273
=======================================================================================
270274
3-clause BSD license
271275
=======================================================================================
272276

273-
3rdparty/mkldnn/src/cpu/x64/xbyak
274-
3rdparty/mkldnn/tests/gtests/gtest
275-
3rdparty/mkldnn/cmake/FindOpenCL.cmake (Copy of the License available at licenses/BSD3-cmake)
276-
3rdparty/mkldnn/src/cpu/x64/jit_utils/jitprofiling/
277+
3rdparty/mkldnn/cmake/FindACL.cmake (see licenses/LICENSE.mkldnn.txt)
278+
3rdparty/mkldnn/cmake/FindBLAS.cmake (see licenses/LICENSE.mkldnn.txt)
279+
3rdparty/mkldnn/cmake/FindOpenCL.cmake (see licenses/LICENSE.mkldnn.txt)
280+
3rdparty/mkldnn/src/cpu/x64/jit_utils/jitprofiling (see licenses/LICENSE.mkldnn.txt)
281+
3rdparty/mkldnn/src/cpu/x64/xbyak (see licenses/LICENSE.mkldnn.txt)
282+
3rdparty/mkldnn/tests/gtests/gtest (see licenses/LICENSE.mkldnn.txt)
277283
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindPythonLibsNew.cmake
278284
3rdparty/ctc_include/contrib/moderngpu
279285
3rdparty/nvidia_cub
@@ -282,6 +288,9 @@
282288
3rdparty/googletest/googletest
283289
cmake/upstream/FindCUDAToolkit.cmake
284290
cmake/upstream/select_compute_arch.cmake
291+
python/mxnet/onnx/mx2onnx/_export_onnx.py
292+
python/mxnet/onnx/mx2onnx/_op_translations/_op_translations_opset12.py
293+
python/mxnet/onnx/mx2onnx/_op_translations/_op_translations_opset13.py
285294
src/operator/contrib/erfinv-inl.h
286295
src/operator/numpy/np_einsum_op-inl.h
287296
src/operator/numpy/np_einsum_path_op-inl.h
@@ -292,11 +301,10 @@
292301
=======================================================================================
293302

294303
3rdparty/dmlc-core/include/dmlc/concurrentqueue.h
295-
include/dmlc/concurrentqueue.h (symlink to 3rdparty/dmlc-core/include/dmlc/concurrentqueue.h)
296-
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindEigen3.cmake (Copy of the License available at licenses/BSD2)
297-
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindPythonLibsNew.cmake
304+
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindEigen3.cmake
298305
3rdparty/tvm/3rdparty/picojson/picojson.h
299306
example/ssd/dataset/pycocotools/coco.py
307+
include/dmlc/concurrentqueue.h (symlink to 3rdparty/dmlc-core/include/dmlc/concurrentqueue.h)
300308

301309
=======================================================================================
302310
Apache-2.0 license + LLVM Exceptions
@@ -305,17 +313,17 @@
305313
3rdparty/openmp
306314

307315
=======================================================================================
308-
Caffe Licensing Model
316+
2-clause BSD license + Caffe Copyright Notice and Disclaimer
309317
=======================================================================================
310318

311-
src/operator/nn/pool.h
312-
src/operator/nn/pool.cuh
313-
src/operator/nn/im2col.h
314-
src/operator/nn/im2col.cuh
315319
src/operator/contrib/nn/deformable_im2col.h
316320
src/operator/contrib/nn/deformable_im2col.cuh
317321
src/operator/contrib/nn/modulated_deformable_im2col.h
318322
src/operator/contrib/nn/modulated_deformable_im2col.cuh
323+
src/operator/nn/pool.h
324+
src/operator/nn/pool.cuh
325+
src/operator/nn/im2col.h
326+
src/operator/nn/im2col.cuh
319327

320328
=======================================================================================
321329
2-clause BSD license + zlib license
@@ -324,26 +332,12 @@
324332
3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h
325333
include/dmlc/blockingconcurrentqueue.h (symlink to 3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h)
326334

327-
=======================================================================================
328-
Apache-2.0 license + 3-clause BSD license
329-
=======================================================================================
330-
331-
python/mxnet/onnx/mx2onnx/_export_onnx.py
332-
python/mxnet/onnx/mx2onnx/_op_translations/_op_translations_opset12.py
333-
python/mxnet/onnx/mx2onnx/_op_translations/_op_translations_opset13.py
334-
335-
=======================================================================================
336-
Apache-2.0 license + MIT License
337-
=======================================================================================
338-
339-
src/operator/nn/layer_norm.cc (function LayerNormCPUKernel is adapated from MIT-licensed code)
340-
341335
=======================================================================================
342336
Boost Software License, Version 1.0
343337
=======================================================================================
344338

345-
3rdparty/intgemm/test/3rd_party/catch.hpp (Copy of the License available at licenses/BOOST1_0)
346-
3rdparty/mkldnn/src/common/primitive_hashing.hpp
339+
3rdparty/intgemm/test/3rd_party/catch.hpp
340+
3rdparty/mkldnn/src/common/primitive_hashing.hpp (see licenses/LICENSE.mkldnn.txt)
347341
cmake/Modules/FindJeMalloc.cmake
348342

349343
=======================================================================================

ci/build_windows.py

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ class BuildFlavour(Enum):
151151

152152
def windows_build(args):
153153
logging.info("Using vcvars environment:\n{}".format(args.vcvars))
154+
if args.vcvars_ver:
155+
logging.info("Using vcvars version:\n{}".format(args.vcvars_ver))
154156

155157
path = args.output
156158

@@ -171,13 +173,22 @@ def windows_build(args):
171173
env = os.environ.copy()
172174
if 'GPU' in args.flavour:
173175
env["CXXFLAGS"] = '/FS /MD /O2 /Ob2'
174-
cmd = "\"{}\" && cmake -GNinja {} {}".format(args.vcvars,
175-
CMAKE_FLAGS[args.flavour],
176-
mxnet_root)
176+
if not args.vcvars_ver:
177+
cmd = "\"{}\" && cmake -GNinja {} {}".format(args.vcvars,
178+
CMAKE_FLAGS[args.flavour],
179+
mxnet_root)
180+
else:
181+
cmd = "\"{}\" -vcvars_ver={} && cmake -GNinja {} {}".format(args.vcvars,
182+
args.vcvars_ver,
183+
CMAKE_FLAGS[args.flavour],
184+
mxnet_root)
177185
logging.info("Generating project with CMake:\n{}".format(cmd))
178186
check_call(cmd, shell=True, env=env)
179187

180-
cmd = "\"{}\" && ninja".format(args.vcvars)
188+
if not args.vcvars_ver:
189+
cmd = "\"{}\" && ninja".format(args.vcvars)
190+
else:
191+
cmd = "\"{}\" -vcvars_ver={} && ninja".format(args.vcvars, args.vcvars_ver)
181192
logging.info("Building:\n{}".format(cmd))
182193

183194
t0 = int(time.time())
@@ -260,6 +271,12 @@ def main():
260271
default=KNOWN_VCVARS['VS 2019'],
261272
type=str)
262273

274+
parser.add_argument("--vcvars_ver",
275+
help="Optionally specifies the Visual Studio compiler toolset to use.\
276+
By default, the environment is set to use the current Visual Studio compiler toolset.",
277+
default=None,
278+
type=str)
279+
263280
parser.add_argument("--arch",
264281
help="architecture",
265282
default='x64',

ci/docker/install/requirements

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
boto3==1.9.229
2222
cpplint==1.3.0
23-
Cython==0.29.7
23+
Cython==0.29.24
2424
decorator==4.4.0
2525
h5py<3
2626
mock==2.0.0
@@ -32,4 +32,4 @@ astroid==2.3.3 # pylint and astroid need to be aligned
3232
requests<2.19.0,>=2.18.4
3333
scipy==1.2.1
3434
setuptools
35-
coverage
35+
coverage

ci/jenkins/Jenkins_steps.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ def compile_windows_cpu() {
558558
ws('workspace/build-cpu') {
559559
timeout(time: max_time, unit: 'MINUTES') {
560560
utils.init_git_win()
561-
powershell 'py -3 ci/build_windows.py -f WIN_CPU'
561+
powershell 'py -3 ci/build_windows.py -f WIN_CPU --vcvars_ver 14.28'
562562
stash includes: 'windows_package.7z', name: 'windows_package_cpu'
563563
}
564564
}
@@ -572,7 +572,7 @@ def compile_windows_cpu_mkldnn() {
572572
ws('workspace/build-cpu-mkldnn') {
573573
timeout(time: max_time, unit: 'MINUTES') {
574574
utils.init_git_win()
575-
powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKLDNN'
575+
powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKLDNN --vcvars_ver 14.28'
576576
stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkldnn'
577577
}
578578
}
@@ -586,7 +586,7 @@ def compile_windows_cpu_mkldnn_mkl() {
586586
ws('workspace/build-cpu-mkldnn-mkl') {
587587
timeout(time: max_time, unit: 'MINUTES') {
588588
utils.init_git_win()
589-
powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKLDNN_MKL'
589+
powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKLDNN_MKL --vcvars_ver 14.28'
590590
stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkldnn_mkl'
591591
}
592592
}
@@ -600,7 +600,7 @@ def compile_windows_cpu_mkl() {
600600
ws('workspace/build-cpu-mkl') {
601601
timeout(time: max_time, unit: 'MINUTES') {
602602
utils.init_git_win()
603-
powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKL'
603+
powershell 'py -3 ci/build_windows.py -f WIN_CPU_MKL --vcvars_ver 14.28'
604604
stash includes: 'windows_package.7z', name: 'windows_package_cpu_mkl'
605605
}
606606
}
@@ -614,7 +614,7 @@ def compile_windows_gpu() {
614614
ws('workspace/build-gpu') {
615615
timeout(time: max_time, unit: 'MINUTES') {
616616
utils.init_git_win()
617-
powershell 'py -3 ci/build_windows.py -f WIN_GPU'
617+
powershell 'py -3 ci/build_windows.py -f WIN_GPU --vcvars_ver 14.28'
618618
stash includes: 'windows_package.7z', name: 'windows_package_gpu'
619619
}
620620
}
@@ -628,7 +628,7 @@ def compile_windows_gpu_mkldnn() {
628628
ws('workspace/build-gpu') {
629629
timeout(time: max_time, unit: 'MINUTES') {
630630
utils.init_git_win()
631-
powershell 'py -3 ci/build_windows.py -f WIN_GPU_MKLDNN'
631+
powershell 'py -3 ci/build_windows.py -f WIN_GPU_MKLDNN --vcvars_ver 14.28'
632632
stash includes: 'windows_package.7z', name: 'windows_package_gpu_mkldnn'
633633
}
634634
}

ci/windows/test_py3_cpu.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ $env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
2323
$env:MXNET_SUBGRAPH_VERBOSE=0
2424
$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home')
2525

26-
C:\Python37\Scripts\pip install -r tests\requirements.txt
27-
C:\Python37\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_unittest.xml tests\python\unittest
26+
C:\Python38\Scripts\pip install -r tests\requirements.txt
27+
C:\Python38\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_unittest.xml tests\python\unittest
2828
if ($LastExitCode -ne 0) { Throw ("Error running unittest, python exited with status code " + ('{0:X}' -f $LastExitCode)) }
29-
C:\Python37\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_train.xml tests\python\train
29+
C:\Python38\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_train.xml tests\python\train
3030
if ($LastExitCode -ne 0) { Throw ("Error running train tests, python exited with status code " + ('{0:X}' -f $LastExitCode)) }
3131
# Adding this extra test since it's not possible to set env var on the fly in Windows.
3232
$env:MXNET_SAFE_ACCUMULATION=1
33-
C:\Python37\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_unittest.xml tests\python\unittest\test_operator.py:test_norm
33+
C:\Python38\python.exe -m nose -v --with-timer --timer-ok 1 --timer-warning 15 --timer-filter warning,error --with-xunit --xunit-file nosetests_unittest.xml tests\python\unittest\test_operator.py:test_norm
3434
if ($LastExitCode -ne 0) { Throw ("Error running unittest, python exited with status code " + ('{0:X}' -f $LastExitCode)) }

0 commit comments

Comments
 (0)