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

[LICENSE] [v1.8.x] Change intgemm to a submodule instead of fetch. #19406

Merged
merged 2 commits into from
Oct 23, 2020

Conversation

kpuatamazon
Copy link
Contributor

Description

This resolves the issue that LICENSE referred to 3rdparty/intgemm/LICENSE which was not present in the source because it was downloaded:

https://lists.apache.org/thread.html/r669576b6506f67ea96e9b1bd385b04f59c4e6e7fa1b13a6dc0abc7d9%40%3Cgeneral.incubator.apache.org%3E

Checklist

Essentials

  • PR's title starts with a category (e.g. [BUGFIX], [MODEL], [TUTORIAL], [FEATURE], [DOC], etc)
  • Changes are complete (i.e. I finished coding on this PR)
  • All changes have test coverage
  • Code is well-documented

Changes

  • Remove fetch from CMakeLists.txt
  • Add submodule in 3rdparty
  • Mention catch in top-level LICENSE

Note

Expect v1.x and master versions of this too.

This resolves the issue that LICENSE refered to 3rdparty/intgemm/LICENSE which was not present in the source because it was downloaded:

https://lists.apache.org/thread.html/r669576b6506f67ea96e9b1bd385b04f59c4e6e7fa1b13a6dc0abc7d9%40%3Cgeneral.incubator.apache.org%3E
@mxnet-bot
Copy link

Hey @kpuatamazon , Thanks for submitting the PR
All tests are already queued to run once. If tests fail, you can trigger one or more tests again with the following commands:

  • To trigger all jobs: @mxnet-bot run ci [all]
  • To trigger specific jobs: @mxnet-bot run ci [job1, job2]

CI supported jobs: [centos-gpu, unix-cpu, miscellaneous, edge, clang, unix-gpu, windows-cpu, windows-gpu, website, sanity, centos-cpu]


Note:
Only following 3 categories can trigger CI :PR Author, MXNet Committer, Jenkins Admin.
All CI tests must pass before the PR can be merged.

@lanking520 lanking520 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Oct 22, 2020
@szha
Copy link
Member

szha commented Oct 22, 2020

sanity check is complaining about license headers in the intgemm module. you can whitelist it in https://github.com/apache/incubator-mxnet/blob/v1.8.x/tests/nightly/apache_rat_license_check/rat-excludes#L40

@lanking520 lanking520 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress and removed pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test labels Oct 22, 2020
@kpuatamazon
Copy link
Contributor Author

kpuatamazon commented Oct 22, 2020

@mxnet-bot run ci [windows-cpu]

I didn't mess with batchnorm.

[2020-10-22T17:36:18.243Z] ======================================================================
[2020-10-22T17:36:18.243Z] FAIL: test_operator.test_batchnorm
[2020-10-22T17:36:18.243Z] ----------------------------------------------------------------------
[2020-10-22T17:36:18.243Z] Traceback (most recent call last):
[2020-10-22T17:36:18.243Z]   File "C:\Python37\lib\site-packages\nose\case.py", line 198, in runTest
[2020-10-22T17:36:18.243Z]     self.test(*self.arg)
[2020-10-22T17:36:18.243Z]   File "C:\jenkins_slave\workspace\ut-python-cpu\tests\python\unittest\common.py", line 218, in test_new
[2020-10-22T17:36:18.243Z]     orig_test(*args, **kwargs)
[2020-10-22T17:36:18.243Z]   File "C:\jenkins_slave\workspace\ut-python-cpu\tests\python\unittest\test_operator.py", line 1990, in test_batchnorm
[2020-10-22T17:36:18.243Z]     gamma_grad_req, beta_grad_req)
[2020-10-22T17:36:18.243Z]   File "C:\jenkins_slave\workspace\ut-python-cpu\tests\python\unittest\test_operator.py", line 1958, in _test_batchnorm_impl
[2020-10-22T17:36:18.243Z]     ), running_var.asnumpy(), atol=atol, rtol=rtol)
[2020-10-22T17:36:18.243Z]   File "C:\jenkins_slave\workspace\ut-python-cpu\windows_package\python\mxnet\test_utils.py", line 749, in assert_almost_equal
[2020-10-22T17:36:18.243Z]     raise AssertionError(msg)
[2020-10-22T17:36:18.243Z] AssertionError: 
[2020-10-22T17:36:18.243Z] Items are not equal:
[2020-10-22T17:36:18.243Z] Error 1.017045 exceeds tolerance rtol=5.000000e-02, atol=5.000000e-02 (mismatch 25.000000%).
[2020-10-22T17:36:18.243Z] Location of maximum error: (1,), a=0.42502668, b=0.50137496
[2020-10-22T17:36:18.243Z]  ACTUAL: array([0.3841784 , 0.42502668, 0.36781523, 0.37314323], dtype=float32)
[2020-10-22T17:36:18.243Z]  DESIRED: array([0.41967845, 0.50137496, 0.3869521 , 0.397608  ], dtype=float32)
[2020-10-22T17:36:18.243Z] -------------------- >> begin captured stdout << ---------------------
[2020-10-22T17:36:18.243Z] 
[2020-10-22T17:36:18.243Z] *** Maximum errors for vector of size 4:  rtol=0.05, atol=0.05
[2020-10-22T17:36:18.243Z] 
[2020-10-22T17:36:18.243Z]   1: Error 1.017045  Location of error: (1,), a=0.42502668, b=0.50137496
[2020-10-22T17:36:18.243Z] 
[2020-10-22T17:36:18.243Z] --------------------- >> end captured stdout << ----------------------
[2020-10-22T17:36:18.243Z] -------------------- >> begin captured logging << --------------------
[2020-10-22T17:36:18.243Z] common: WARNING: Error seen with seeded test, use MXNET_TEST_SEED=1495319684 to reproduce.
[2020-10-22T17:36:18.243Z] --------------------- >> end captured logging << ---------------------
[2020-10-22T17:36:18.243Z] 
[2020-10-22T17:36:18.243Z] ----------------------------------------------------------------------

@mxnet-bot
Copy link

Undefined action detected.
Permissible actions are : run ci [all], run ci [job1, job2]
Example : @mxnet-bot run ci [all]
Example : @mxnet-bot run ci [centos-cpu, clang]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [windows-cpu]

@lanking520 lanking520 added pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-work-in-progress PR is still work in progress labels Oct 22, 2020
@lanking520 lanking520 added pr-work-in-progress PR is still work in progress and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Oct 22, 2020
@kpuatamazon
Copy link
Contributor Author

@mxnet-bot run ci [unix-gpu]

Why was it aborted?

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@lanking520 lanking520 added pr-awaiting-review PR is waiting for code review and removed pr-work-in-progress PR is still work in progress labels Oct 22, 2020
Copy link
Contributor

@samskalicky samskalicky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kpuatamazon !

@leezu leezu merged commit 2b11c0d into apache:v1.8.x Oct 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
pr-awaiting-review PR is waiting for code review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants