You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ma...@apache.org on 2021/07/12 18:35:46 UTC
[incubator-mxnet] branch v1.x updated: [v1.x] Backport #20428 from
v1.9.x (#20434)
This is an automated email from the ASF dual-hosted git repository.
manuseth pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.x by this push:
new 2d02d6f [v1.x] Backport #20428 from v1.9.x (#20434)
2d02d6f is described below
commit 2d02d6f59d1fd503932f6565c474d3cfe46c6854
Author: Joe Evans <jo...@gmail.com>
AuthorDate: Mon Jul 12 11:34:05 2021 -0700
[v1.x] Backport #20428 from v1.9.x (#20434)
* [v1.9.x] License updates per feedback (#20428)
* Remove Apache license header from files already containing Caffe license.
* Update license check whitelist for files under Caffe license.
* Update rat check exclude list with Caffe-licensed files.
* Don't install caffe python dependencies, as it overwrites our fixed versions.
* Restrict scipy version in test requirements.txt to avoid issue with scipy 1.7.0 and rand generator test failures.
* Revert "[v1.x] Skip windows failing tests (#20395)"
This reverts commit 02f4942a8bf48a32e94873952a4a6a95c999e14e.
* Update scipy in python requirements for linux docker containers.
---
ci/docker/install/requirements | 4 ++--
ci/docker/install/ubuntu_caffe.sh | 5 +++--
rat-excludes | 3 +++
.../contrib/nn/modulated_deformable_im2col.cuh | 19 -------------------
src/operator/contrib/nn/modulated_deformable_im2col.h | 19 -------------------
src/operator/nn/pool.cuh | 19 -------------------
tests/python/unittest/test_numpy_op.py | 2 --
tests/python/unittest/test_random.py | 7 -------
tests/requirements.txt | 2 +-
tools/license_header.py | 3 +++
10 files changed, 12 insertions(+), 71 deletions(-)
diff --git a/ci/docker/install/requirements b/ci/docker/install/requirements
index 210914a..02c85e9 100644
--- a/ci/docker/install/requirements
+++ b/ci/docker/install/requirements
@@ -30,6 +30,6 @@ numpy>1.16.0,<1.19.0 # Restrict numpy version to < 1.19.0 due to https://github
pylint==2.3.1 # pylint and astroid need to be aligned
astroid==2.3.3 # pylint and astroid need to be aligned
requests<2.19.0,>=2.18.4
-scipy==1.2.1
+scipy<1.7.0 # Restrict scipy version due to https://github.com/apache/incubator-mxnet/issues/20389
setuptools
-coverage
\ No newline at end of file
+coverage
diff --git a/ci/docker/install/ubuntu_caffe.sh b/ci/docker/install/ubuntu_caffe.sh
index 503b57f..40ccc3c 100755
--- a/ci/docker/install/ubuntu_caffe.sh
+++ b/ci/docker/install/ubuntu_caffe.sh
@@ -55,5 +55,6 @@ ln -s /usr/lib/x86_64-linux-gnu/libhdf5_serial_hl.so.10.0.2 /usr/lib/x86_64-linu
make all pycaffe -j$(nproc)
-cd python
-for req in $(cat requirements.txt); do pip3 install $req; done
+# Do not install caffe python dependencies, as it overwrites our specified versions in ci/docker/install/requirements
+#cd python
+#pip3 install -r requirements.txt
diff --git a/rat-excludes b/rat-excludes
index 56d6162..5fc635c 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -120,11 +120,14 @@ CODEOWNERS
# Incorporated third-party source files that carry its own license, captured in licenses/
pool.h
+pool.cuh
erfinv-inl.h
im2col.cuh
im2col.h
deformable_im2col.cuh
deformable_im2col.h
+modulated_deformable_im2col.cuh
+modulated_deformable_im2col.h
FindCUDAToolkit.cmake
select_compute_arch.cmake
diff --git a/src/operator/contrib/nn/modulated_deformable_im2col.cuh b/src/operator/contrib/nn/modulated_deformable_im2col.cuh
index 16d9cef..74fc994 100644
--- a/src/operator/contrib/nn/modulated_deformable_im2col.cuh
+++ b/src/operator/contrib/nn/modulated_deformable_im2col.cuh
@@ -1,22 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
/*!
******************* BEGIN Caffe Copyright Notice and Disclaimer ****************
*
diff --git a/src/operator/contrib/nn/modulated_deformable_im2col.h b/src/operator/contrib/nn/modulated_deformable_im2col.h
index b50eb13..560856b 100644
--- a/src/operator/contrib/nn/modulated_deformable_im2col.h
+++ b/src/operator/contrib/nn/modulated_deformable_im2col.h
@@ -1,22 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
/*!
******************* BEGIN Caffe Copyright Notice and Disclaimer ****************
*
diff --git a/src/operator/nn/pool.cuh b/src/operator/nn/pool.cuh
index e771b36..3810e2c 100644
--- a/src/operator/nn/pool.cuh
+++ b/src/operator/nn/pool.cuh
@@ -1,22 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
/*!
******************* BEGIN Caffe Copyright Notice and Disclaimer ****************
*
diff --git a/tests/python/unittest/test_numpy_op.py b/tests/python/unittest/test_numpy_op.py
index add0620..4bdaf52 100644
--- a/tests/python/unittest/test_numpy_op.py
+++ b/tests/python/unittest/test_numpy_op.py
@@ -3493,7 +3493,6 @@ def test_np_ravel():
@with_seed()
@use_np
-@unittest.skipIf(sys.platform.startswith('win'), 'https://github.com/apache/incubator-mxnet/issues/20389')
def test_np_randint():
ctx = mx.context.current_context()
# test shapes
@@ -7257,7 +7256,6 @@ def test_np_pad():
@with_seed()
@use_np
-@unittest.skipIf(sys.platform.startswith('win'), 'https://github.com/apache/incubator-mxnet/issues/20389')
def test_np_rand():
# Test shapes.
shapes = [
diff --git a/tests/python/unittest/test_random.py b/tests/python/unittest/test_random.py
index f85503f..efcf16d 100644
--- a/tests/python/unittest/test_random.py
+++ b/tests/python/unittest/test_random.py
@@ -603,7 +603,6 @@ def test_sample_multinomial():
# Test the generators with the chi-square testing
@with_seed()
-@unittest.skipIf(sys.platform.startswith('win'), 'https://github.com/apache/incubator-mxnet/issues/20389')
def test_normal_generator():
ctx = mx.context.current_context()
samples = 1000000
@@ -628,7 +627,6 @@ def test_normal_generator():
nsamples=samples, nrepeat=trials)
@with_seed()
-@unittest.skipIf(sys.platform.startswith('win'), 'https://github.com/apache/incubator-mxnet/issues/20389')
def test_uniform_generator():
ctx = mx.context.current_context()
for dtype in ['float16', 'float32', 'float64']:
@@ -662,7 +660,6 @@ def test_gamma_generator():
verify_generator(generator=generator_mx_same_seed, buckets=buckets, probs=probs, success_rate=success_rate)
@with_seed()
-@unittest.skipIf(sys.platform.startswith('win'), 'https://github.com/apache/incubator-mxnet/issues/20389')
def test_exponential_generator():
ctx = mx.context.current_context()
for dtype in ['float16', 'float32', 'float64']:
@@ -677,7 +674,6 @@ def test_exponential_generator():
verify_generator(generator=generator_mx_same_seed, buckets=buckets, probs=probs, success_rate=0.20)
@with_seed()
-@unittest.skipIf(sys.platform.startswith('win'), 'https://github.com/apache/incubator-mxnet/issues/20389')
def test_poisson_generator():
ctx = mx.context.current_context()
for dtype in ['float16', 'float32', 'float64']:
@@ -693,7 +689,6 @@ def test_poisson_generator():
verify_generator(generator=generator_mx_same_seed, buckets=buckets, probs=probs)
@with_seed()
-@unittest.skipIf(sys.platform.startswith('win'), 'https://github.com/apache/incubator-mxnet/issues/20389')
def test_negative_binomial_generator():
ctx = mx.context.current_context()
for dtype in ['float16', 'float32', 'float64']:
@@ -723,7 +718,6 @@ def test_negative_binomial_generator():
verify_generator(generator=generator_mx_same_seed, buckets=buckets, probs=probs)
@with_seed()
-@unittest.skipIf(sys.platform.startswith('win'), 'https://github.com/apache/incubator-mxnet/issues/20389')
def test_multinomial_generator():
# This test fails with dtype float16 if the probabilities themselves cannot be
# well-represented in float16. When the float16 random picks are assigned to buckets,
@@ -1006,7 +1000,6 @@ def test_randint_extremes():
assert a>=50000000 and a<=50000010
@with_seed()
-@unittest.skipIf(sys.platform.startswith('win'), 'https://github.com/apache/incubator-mxnet/issues/20389')
def test_randint_generator():
ctx = mx.context.current_context()
for dtype in ['int32', 'int64']:
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 24764fb..679d2aa 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -5,5 +5,5 @@ nose
nose-timer
ipython
numpy>1.16.0,<1.19.0 # Restrict numpy version to < 1.19.0 due to https://github.com/apache/incubator-mxnet/issues/18600
-scipy
+scipy<1.7.0 # Restrict scipy version due to https://github.com/apache/incubator-mxnet/issues/20389
onnxruntime
diff --git a/tools/license_header.py b/tools/license_header.py
index ccc45bd..e469344 100755
--- a/tools/license_header.py
+++ b/tools/license_header.py
@@ -95,9 +95,12 @@ _WHITE_LIST = [
# Licensed under Caffe header
'src/operator/nn/pool.h',
+ 'src/operator/nn/pool.cuh',
'src/operator/contrib/psroi_pooling-inl.h',
'src/operator/contrib/nn/deformable_im2col.h',
'src/operator/contrib/nn/deformable_im2col.cuh',
+ 'src/operator/contrib/nn/modulated_deformable_im2col.h',
+ 'src/operator/contrib/nn/modulated_deformable_im2col.cuh',
'src/operator/nn/im2col.h',
'src/operator/nn/im2col.cuh',