Skip to content

Commit

Permalink
[LICENSE] [v1.x] Change intgemm to a submodule instead of fetch. (apa…
Browse files Browse the repository at this point in the history
…che#19407)

* Change intgemm to a submodule instead of fetch.

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

* Exclude intgemm from license header check
  • Loading branch information
kpuatamazon authored Oct 25, 2020
1 parent 778f02f commit 9ed6aae
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@
[submodule "3rdparty/nvidia_cub"]
path = 3rdparty/nvidia_cub
url = https://github.com/NVlabs/cub.git
[submodule "3rdparty/intgemm"]
path = 3rdparty/intgemm
url = https://github.com/kpu/intgemm
1 change: 1 addition & 0 deletions 3rdparty/intgemm
Submodule intgemm added at 8f2828
12 changes: 1 addition & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -314,17 +314,7 @@ endif()

if(USE_INTGEMM)
message(STATUS "Using intgemm")
include(FetchContent)
FetchContent_Declare(
intgemm
GIT_REPOSITORY https://github.com/kpu/intgemm.git
GIT_TAG 4172dcc209e6793dd920dec9cf9c9fc81605bd9d
)
FetchContent_GetProperties(intgemm)
if(NOT intgemm_POPULATED)
FetchContent_Populate(intgemm)
endif()
add_subdirectory(${intgemm_SOURCE_DIR} ${intgemm_BINARY_DIR} EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/intgemm EXCLUDE_FROM_ALL)
add_definitions(-DMXNET_USE_INTGEMM=1)
endif()

Expand Down
37 changes: 37 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@
Copyright (c) 2016 myyasuda
12. intgemm - Refer to 3rdparty/intgemm/LICENSE
Copyright (c) 2017--2019 University of Edinburgh, Nikolay Bogoychev, Mateusz Chudyk, Kenneth Heafield, and Microsoft Corporation
(Except 3rdparty/intgemm/test/3rd_party/catch.hpp is under the Boost license, listed separately)


=======================================================================================
Expand Down Expand Up @@ -958,6 +959,8 @@

For more information, please refer to <http://unlicense.org>

=======================================================================================

20. Font-Awesome, SIL Open Font License(OFL)

For details, see ./docs/python_docs/themes/mx-theme/mxtheme/static/webfonts/
Expand All @@ -968,6 +971,40 @@

For full text of the SIL Open Font License, refer to <https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL>

=======================================================================================

21. Catch

Only the file 3rdparty/intgemm/test/3rd_party/catch.hpp

Copyright (c) 2019 Two Blue Cubes Ltd. All rights reserved.
Distributed under the Boost Software License, Version 1.0. (See below
or copy at http://www.boost.org/LICENSE_1_0.txt)

Boost Software License - Version 1.0 - August 17th, 2003

Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:

The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

=======================================================================================
Appendix
=======================================================================================
Expand Down
1 change: 1 addition & 0 deletions tests/nightly/apache_rat_license_check/rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ ctc_include/*
dlpack/*
dmlc-core/*
googletest/*
intgemm/*
mkldnn/*
nvidia_cub/*
onnx-tensorrt/*
Expand Down

0 comments on commit 9ed6aae

Please sign in to comment.