Skip to content

Commit 930d984

Browse files
Modify LICENSE, add third-party-programs.txt
1 parent 3ea986c commit 930d984

File tree

3 files changed

+61
-1
lines changed

3 files changed

+61
-1
lines changed

LICENSE

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
Copyright (C) 2020-2021 Intel Corporation
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
14+
15+
116
MIT License
217

318
Copyright (c) 2018 Kaiyang Zhou

docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# -- Project information -----------------------------------------------------
2121

2222
project = u'torchreid'
23-
copyright = u'2019, Kaiyang Zhou'
23+
copyright = u'2019, Kaiyang Zhou; 2020-2021, Intel'
2424
author = u'Kaiyang Zhou'
2525

2626
version_file = '../torchreid/__init__.py'

third-party-programs.txt

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
Intel Torchreid Third Party Programs File
2+
3+
This file contains the list of third party software ("third party programs")
4+
contained in the Intel software and their required notices and/or license
5+
terms. This third party software, even if included with the distribution of
6+
the Intel software, may be governed by separate license terms, including
7+
without limitation, third party license terms, other Intel software license
8+
terms, and open source software license terms. These separate license terms
9+
govern your use of the third party programs as set forth in the
10+
"third-party-programs.txt" or other similarly-named text file.
11+
12+
Third party programs and their corresponding required notices and/or license
13+
terms are listed below.
14+
15+
-------------------------------------------------------------
16+
17+
1. fmix
18+
Copyright (c) 2020 Vision, Learning and Control Research Group
19+
20+
MIT License
21+
22+
Copyright (c) 2020 Vision, Learning and Control Research Group
23+
24+
Permission is hereby granted, free of charge, to any person obtaining a copy
25+
of this software and associated documentation files (the "Software"), to deal
26+
in the Software without restriction, including without limitation the rights
27+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
28+
copies of the Software, and to permit persons to whom the Software is
29+
furnished to do so, subject to the following conditions:
30+
31+
The above copyright notice and this permission notice shall be included in all
32+
copies or substantial portions of the Software.
33+
34+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
35+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
36+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
37+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
38+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
39+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
40+
SOFTWARE.
41+
42+
-------------------------------------------------------------
43+
44+
2. GeneralizedMeanPooling
45+
Copyright (c) 2019 mangye16

0 commit comments

Comments
 (0)