Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[License] move cma_api to 3rdparty. separate BSD 2-clause and 3-clause #4410

Merged
merged 2 commits into from
Nov 24, 2019

Conversation

yzhliu
Copy link
Member

@yzhliu yzhliu commented Nov 24, 2019

LICENSE Outdated
@@ -214,18 +214,22 @@ Apache Software Foundation License 2.0
3rdparty/dmlc-core


BSD License
BSD 2-clause License
-----------
Copy link
Member

Choose a reason for hiding this comment

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

make sure the underscore covers all the above line


BSD 3-clause License
-----------

3rdparty/dmlc-core/include/dmlc/concurrentqueue.h
Copy link
Member

Choose a reason for hiding this comment

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

Add 3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h
c.f. https://github.com/apache/incubator-mxnet/blob/master/LICENSE#L337

Copy link
Member

Choose a reason for hiding this comment

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

NOTE: we need to add a license file for blockingconcurrentqueue.h, as part of the file is under zlib, and others under BSD-2

Copy link
Member

Choose a reason for hiding this comment

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

We should have a section

BSD 2-clause license + zlib license

Copy link
Member

@tqchen tqchen left a comment

Choose a reason for hiding this comment

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

I pre-approved, can merged as long as the comments are fixed

LICENSE Outdated
-----------

3rdparty/picojson


BSD 3-clause License
Copy link
Member

Choose a reason for hiding this comment

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

Sorry I double checked, and find that the concurrentqueue.h is under BSD-2 (instead of 3)

@yzhliu
Copy link
Member Author

yzhliu commented Nov 24, 2019

@tqchen please double check.

@tqchen tqchen merged commit 6a9e6e4 into apache:master Nov 24, 2019
@tqchen
Copy link
Member

tqchen commented Nov 24, 2019

Thanks @yzhliu I will send a followup PR to refine the blockingconcurrentqueue license

zxy844288792 pushed a commit to zxy844288792/tvm that referenced this pull request Nov 26, 2019
apache#4410)

* [License] move cma_api to 3rdparty. separate BSD 2-clause and 3-clause

* add zlib license for blockingconcurrentqueue.h
yongwww pushed a commit to neo-ai/tvm that referenced this pull request Nov 26, 2019
apache#4410)

* [License] move cma_api to 3rdparty. separate BSD 2-clause and 3-clause

* add zlib license for blockingconcurrentqueue.h
tqchen pushed a commit to tqchen/tvm that referenced this pull request Mar 29, 2020
apache#4410)

* [License] move cma_api to 3rdparty. separate BSD 2-clause and 3-clause

* add zlib license for blockingconcurrentqueue.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants