Change header files of non-GPL licensed code #4032

sorig · 2017-12-17T17:55:23Z

No description provided.

lisitsyn · 2017-12-17T18:49:03Z

Started reviewing!

lisitsyn · 2017-12-17T18:52:26Z

applications/classification/random_fourier_classification.cpp

 *
- * Written (W) 2013 Evangelos Anagnostopoulos
+ * Authors: van51, Björn Esser


van51 -> Evangelos Anagnostopoulos

lisitsyn · 2017-12-17T18:52:48Z

benchmarks/hasheddoc_benchmarks.cpp

 *
- * Written (W) 2013 Evangelos Anagnostopoulos
- * Copyright (C) 2013 Evangelos Anagnostopoulos
+ * Authors: van51


van51 -> Evangelos Anagnostopoulos

lisitsyn · 2017-12-17T18:53:14Z

benchmarks/sparse_test.cpp

 *
- * Written (W) 2013 Soumyajit De
+ * Authors: Soeren Sonnenburg, OXPHOS, lambday, Björn Esser


OXPHOS -> Pan Deng
lambday -> Soumyajit De

lisitsyn · 2017-12-17T18:54:12Z

examples/undocumented/libshogun/balanced_conditional_probability_tree.cpp

- * Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
- *
- * This example demonstrates use of the Vowpal Wabbit learning algorithm.
+ * Authors: Chiyuan Zhang, iglesias, Thoralf Klein


Shashwat Lal Das disappeared

iglesias -> Fernando Iglesias

lisitsyn · 2017-12-17T18:55:26Z

examples/undocumented/libshogun/classifier_mklmulticlass.cpp

 *
- * Written (W) 2009 Alexander Binder
- * Copyright (C) 2009 Fraunhofer Institute FIRST and Max-Planck-Society
+ * Authors: Soeren Sonnenburg, D. Lehmann, Evgeniy Andreev, Thoralf Klein,


D. Lehmann should not be in any list due to being D. Lehmann

yep just remove

lisitsyn · 2017-12-17T18:56:55Z

examples/undocumented/libshogun/evaluation_cross_validation_multiclass.cpp

 *
- * Written (W) 2012 Heiko Strathmann
- * Copyright (C) 2012 Berlin Institute of Technology and Max-Planck-Society
+ * Authors: Soeren Sonnenburg, Heiko Strathmann, Viktor Gal, puffin444, Evgeniy


puffin444 -> Jacob Walker

lisitsyn · 2017-12-17T18:57:33Z

examples/undocumented/libshogun/io_libsvm_multilabel.cpp

 *
- * Written (W) 2014 Jiaolong Xu
- * Copyright (C) 2014 Jiaolong Xu
+ * Authors: jiaolong, Björn Esser


jiaolong -> Jiaolong Xu

lisitsyn · 2017-12-17T18:57:57Z

examples/undocumented/libshogun/kernel_custom.cpp

 *
- * Written (W) 2012 Heiko Strathmann
+ * Authors: pl8787, Heiko Strathmann, Fernando Iglesias


pl8787 -> Liang Pang

lisitsyn · 2017-12-17T19:00:51Z

examples/undocumented/libshogun/so_multiclass_BMRM.cpp

- * Copyright (C) 2012 Michal Uricar
+ * Authors: Michal Uricar, iglesias, Soeren Sonnenburg, Heiko Strathmann,
+ *          Evgeniy Andreev, Thoralf Klein, Viktor Gal, Björn Esser, Sergey
+ *          Lisitsyn, Sanuj, hushell


hushell -> Shell Hu

lisitsyn · 2017-12-17T19:03:18Z

I just put some replacements you might want to make. Don't know if we need it though.

sorig · 2017-12-18T11:44:41Z

src/shogun/clustering/KMeans.cpp

 *
- * Written (W) 2014 Parijat Mazumdar
- * Written (W) 2016 Saurabh Mahindre
+ * Authors: Heiko Strathmann, Soeren Sonnenburg, Saurabh7, Sergey Lisitsyn,


Saurabh7 -> Saurabh Mahindre

sorig · 2017-12-18T11:45:39Z

src/shogun/clustering/KMeansMiniBatch.cpp

 *
- * Written (W) 2014 Parijat Mazumdar
+ * Authors: Saurabh7, Heiko Strathmann, micmn, Viktor Gal


micmn -> Michele Mazzoni

sorig · 2017-12-18T11:46:57Z

src/shogun/converter/ManifoldSculpting.cpp

 *
- * Written (W) 2013 Vladyslav S. Gorbatiuk
- * Copyright (C) 2011-2013 Vladyslav S. Gorbatiuk
+ * Authors: Heiko Strathmann, Björn Esser, vladislav.horbatiuk@gmail.com


vladislav.horbatiuk@gmail.com -> Vladislav Horbatiuk

sorig · 2017-12-18T11:49:34Z

src/shogun/converter/ica/FastICA.cpp

 *
- * Written (W) 2013 Kevin Hughes
- * ported from scikit-learn
+ * Authors: Kevin, Heiko Strathmann, Tiramisu 1993, Björn Esser


Tiramisu 1993 -> Weijie Lin

sorig · 2017-12-18T11:50:13Z

src/shogun/converter/ica/ICAConverter.h

 *
- * Written (W) 2013 Kevin Hughes
+ * Authors: Kevin, Heiko Strathmann, Thoralf Klein, Björn Esser


in src/shogun/converter/ica only:
Kevin -> Kevin Hughes

sorig · 2017-12-18T11:56:12Z

src/shogun/distance/CustomMahalanobisDistance.cpp

 *
- * Written (W) 2013 Fernando J. Iglesias Garcia
- * Copyright (C) 2013 Fernando J. Iglesias Garcia
+ * Authors: Soeren Sonnenburg, Viktor Gal, Heiko Strathmann, iglesias, Fernando


Merge same authors

sorig · 2017-12-18T11:57:15Z

src/shogun/distance/Distance.h

+ * Authors: Soeren Sonnenburg, iglesias, Sergey Lisitsyn, Chiyuan Zhang,
+ *          Saurabh7, Heiko Strathmann, abhinavrai44, Yuyu Zhang, Evgeniy
+ *          Andreev, Thoralf Klein, micmn, Evan Shelhamer, Björn Esser,
+ *          lambday, Saurabh Goyal


lambday -> Soumyajit De

sorig · 2017-12-18T11:57:39Z

src/shogun/distance/EuclideanDistance.h

- * Written (W) 2016 Soumyajit De
- * Copyright (C) 2007-2009 Fraunhofer Institute FIRST and Max-Planck-Society
+ * Authors: Chiyuan Zhang, Saurabh7, Yuyu Zhang, Björn Esser, Soeren
+ *          Sonnenburg, lambday, Sanuj


Sanuj -> Sanuj Sharma

sorig · 2017-12-18T11:59:40Z

src/shogun/distributions/Gaussian.cpp

- * Written (W) 2014 Parijat Mazumdar
- * Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
+ * Authors: Soeren Sonnenburg, Parijat Mazumdar, Tiramisu 1993, Alesis Novik,
+ *          Heiko Strathmann, Evgeniy Andreev, Viktor Gal, MikeLing, Evan


MikeLing -> Weijie Lin

sorig · 2017-12-18T12:01:54Z

src/shogun/evaluation/ClusteringAccuracy.cpp

 *
- * Written (W) 2012 Chiyuan Zhang
- * Copyright (C) 2012 Chiyuan Zhang
+ * Authors: Soeren Sonnenburg, pluskid


pluskid -> Chiyuan Zhang

karlnapf · 2017-12-22T10:23:45Z

Shall we try to get this going?

sorig · 2017-12-25T09:43:00Z

@karlnapf I've edited my script with a custom author map that needs review here. All the entries that are '' need to be looked at. None means remove the author. I've added associated emails in a comment next to the author name.

sorig · 2017-12-25T09:46:54Z

i.e. I need comments on what the following authors should be called

    'Abhijeet': '', # abhijeetkislay@gmail.com
    'Andrew': '', # tereskin@gmail.com
    'David': '', # HeyItsDavid@users.noreply.github.com
    'Dhruv': '', # durovo@users.noreply.github.com
    'EdgeX': '', # tonmoysaikia@live.com
    'F0Z': '', # akpraharaj@iitb.ac.in
    'IOcodegeass': '', # shubhamskv10@gmail.com
    'Monique': '', # monique@work.(none)
    'Nightrain': '', # SayapinSasha@gmail.com
    'Olivier': '', # nguyenolive@gmail.com
    'Vipin': '', # vipin@cbio.mskcc.org
    'Vipin T Sreedharan': '', # vipin.ts@tuebingen.mpg.de
    'Xbar': '', # wishyx@gmail.com
    'ZhengyangL': '', # liuzhengyang@outlook.com
    'abhinavmoudgil95': '', # abhinavmoudgil95@gmail.com
    'abhinavrai44': '', # abhinavrai44@gmail.com
    'abinashpanda': '', # abinash.panda.ece10@itbhu.ac.in
    'adit-39': '', # adit.39@gmail.com
    'ahcorde': '', # ahcorde@gmail.com
    'asia': '', # asia@asia.(none)
    'cameron': '', # cameronjml2@gmail.com
    'christopher': '', # christopher.goldsworthy@outlook.com
    'cwidmer': '', # cwidmer@tue.mpg.de
    'deerishi': '', # deerishi@gmail.com
    'deveshnag1': '', # devesh.nag1@gmail.com
    'dhruv13j': '', # dhruv13.j@gmail.com
    'dkostka': '', # dkostka@users.noreply.github.com
    'dmkorn': '', # daniel.m.korn@gmail.com
    'foulwall': '', # liuzhengyang@outlook.com
    'frank0523': '', # zhangyuyu2008@gmail.com
    'hongguang guo': '', # thinkdeeper@hongguangdeMacBook-Pro.local
    'hongguangguo': '', # ghghaut@gmail.com 
    'hwl596': '', # hiroshima596@gmail.com
    'itsuper7': '', # itsuper7@gmail.com
    'jacobw': '', # jacobw@localhost.(none)
    'jey1401': '', # jey1401@gmail.com
    'khalednasr': '', # k.nasr92@gmail.com
    'kislayabhi': '', # abhijeetkislay@gmail.com
    'lionelc': '', # ljiang@cct.lsu.edu
    'liqiang': '', # liqiang036@126.com
    'mickyaero': '', # mickydroch@gmail.com
    'minxuancao': '', # michellecao95@gmail.com
    'monicadragan': '', # monique@work.(none)
    'parijat': '', # mazumdarparijat@gmail.com
    'pl': '', # pl@pl-HVM-domU.(none)
    'ptizoom': '', # ptizoom@gmail.com
    'rahul': '', # rahul@localhost.localdomain
    'ryan': '', # ryan@shoeshine.cc.gt.atl.ga.us
    'sudk1896': '', # sudk1896@gmail.com
    'theaverageguy': '', # yash14123@iiitd.ac.in
    'thereisnoknife': '', # thereisnoknife@gmail.com
    'tklein23': '', # tklein23@users.noreply.github.com
    'trevor': '', # trevor.ballard@outlook.com
    'vipints': '', # vipin@cbio.mskcc.org
    'yorkerlin': '', # yorker.lin@gmail.com
    'youssef': '', # youssef.emad.attia@gmail.com
    'zhh210': '', # zhh210@lehigh.edu

sorig · 2017-12-25T09:52:38Z

I'll re-run the script on develop and push the changes here once the author renaming is done :)

karlnapf · 2017-12-25T18:17:28Z

Those are the ones I know. The rest did not put their names, so it is fine to drop the mention. It is still in the git log anyways ....

'Abhijeet Kislay': '', # abhijeetkislay@gmail.com 
'Olivier NGuyen': '', # nguyenolive@gmail.com
'Vipin T Sreedharan': '', # vipin.ts@tuebingen.mpg.de
'Liu Zhengyang': '', # liuzhengyang@outlook.com # same as below
'Abinash Panda': '', # abinash.panda.ece10@itbhu.ac.in
'Christopher Goldsworthy': '', # christopher.goldsworthy@outlook.com
'Christian Widmer': '', # cwidmer@tue.mpg.de
'Liu Zhengyang': '', # liuzhengyang@outlook.com # same as above
'Khaled Nasr': '', # k.nasr92@gmail.com
'kislayabhi': '', # abhijeetkislay@gmail.com # same as above
'Parijat Mazumdar': '', # mazumdarparijat@gmail.com
'Thoralf Klein': '', # tklein23@users.noreply.github.com
'Trevor Ballard': '', # trevor.ballard@outlook.com
'Wu Lin': '', # yorker.lin@gmail.com
'Youssef Emad El-Din': '', # youssef.emad.attia@gmail.com

karlnapf · 2018-01-05T18:41:04Z

Jo!
Shall we get this one in? :)

sorig · 2018-01-18T18:33:41Z

OK, I've added the final author name changes and re-run the script.

A few files that were in the GPL->BSD list are no longer there. Looks like they have been removed in the meantime. These are the files:

examples/undocumented/libshogun/streaming_vowpalwabbit.cpp
examples/undocumented/libshogun/streaming_vwfeatures.cpp
src/shogun/io/streaming/StreamingVwCacheFile.h
src/shogun/io/streaming/StreamingVwCacheFile.cpp
src/shogun/io/streaming/StreamingVwFile.cpp
src/shogun/io/streaming/StreamingVwFile.h
src/shogun/features/streaming/StreamingVwFeatures.h
src/shogun/features/streaming/StreamingVwFeatures.cpp
src/shogun/multiclass/tree/VwConditionalProbabilityTree.cpp
src/shogun/multiclass/tree/VwConditionalProbabilityTree.h

karlnapf · 2018-01-18T18:34:44Z

Yep we killed those :)

karlnapf · 2018-01-18T18:38:19Z

src/shogun/classifier/svm/GNPPLib.cpp

- *
-------------------------------------------------------------------- */
+/*
+ * This software is distributed under BSD 3-clause license (see LICENSE file).


this one should probably contain Vojtech Franc.
Tricky situation as he is not in the git log. Can you add him manually?

karlnapf · 2018-01-18T18:38:27Z

src/shogun/classifier/svm/GNPPLib.h

+/*
+ * This software is distributed under BSD 3-clause license (see LICENSE file).
+ *
+ * Authors: Soeren Sonnenburg, Saurabh Goyal


karlnapf · 2018-01-18T18:38:37Z

src/shogun/classifier/svm/GNPPSVM.cpp

+/*
+ * This software is distributed under BSD 3-clause license (see LICENSE file).
+ *
+ * Authors: Soeren Sonnenburg, Heiko Strathmann, Sergey Lisitsyn


karlnapf · 2018-01-18T18:38:46Z

src/shogun/classifier/svm/GNPPSVM.h

 *
- * Written (W) 1999-2008 Vojtech Franc, xfrancv@cmp.felk.cvut.cz
- * Copyright (C) 1999-2008 Center for Machine Perception, CTU FEL Prague
+ * Authors: Soeren Sonnenburg, Heiko Strathmann, Evan Shelhamer, 


karlnapf · 2018-01-18T18:40:40Z

src/shogun/features/LBPPyrDotFeatures.cpp

 *
- * Written (W) 2010 Vojtech Franc, Soeren Sonnenburg


karlnapf · 2018-01-18T18:41:24Z

I am ok to merge this.
@lisitsyn @vigsterkr wanna take the honor?

sorig · 2018-01-19T09:47:29Z

Just added Vojtech to those 5 files :)

karlnapf · 2018-01-19T10:03:49Z

Thanks!
No idea why the build would ever fail for those changes, but let's wait anyways

karlnapf · 2018-01-21T18:29:14Z

@sorig
Hey just saw that there might be some files missing:
https://github.com/shogun-toolbox/shogun/blob/develop/src/shogun/features/iterators/DotIterator.h#L2

karlnapf · 2018-01-22T09:15:48Z

Unit tests also seem to not have been updated:
https://github.com/shogun-toolbox/shogun/blob/develop/tests/unit/base/DynamicObjectArray_unittest.cc#L3

karlnapf · 2018-01-22T09:25:38Z

@sorig would you mind updating this? Also the script you used would be handy

karlnapf · 2018-01-23T14:33:42Z

https://github.com/shogun-toolbox/shogun/blob/develop/src/shogun/base/class_list.cpp.templ
https://github.com/shogun-toolbox/shogun/blob/develop/src/shogun/base/class_list.cpp.py

sorig · 2018-01-25T11:05:40Z

I see. Those files weren't changed because the comments don't have the actual GPL license text in them. Maybe we need to change them manually.

I guess we need to go through all files outside the gpl sub directory and check whether they have the BSD comment text or not.

karlnapf · 2018-01-25T13:59:24Z

actually, these are fine as they are BSD already, I was confused

The only ones left are

./mathematics/linalg/ratapprox/tracesampler/ProbingSampler.h: * under GPL2+) for graph coloring related things.
./mathematics/linalg/ratapprox/opfunc/RationalApproximation.h: * under GPL2+. See https://github.com/Froskekongen/KRYLSTAT.
./mathematics/linalg/linsolver/CGMShiftedFamilySolver.h: * written by Erlend Aune, under GPL2+
./mathematics/linalg/linop/SparseMatrixOperator.h: * under GPL2+

I will take care of those, as the files actually are GPL and need to be moved

lisitsyn reviewed Dec 17, 2017

View reviewed changes

sorig commented Dec 18, 2017

View reviewed changes

sorig force-pushed the bsd_change branch 2 times, most recently from acae972 to 8deae5c Compare January 18, 2018 18:30

karlnapf reviewed Jan 18, 2018

View reviewed changes

src/shogun/features/LBPPyrDotFeatures.cpp

*

* Written (W) 2010 Vojtech Franc, Soeren Sonnenburg

Copy link

Member

karlnapf Jan 18, 2018

Choose a reason for hiding this comment

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

vojtech

Change header files of non-GPL licensed code

9a9b6d7

sorig force-pushed the bsd_change branch from 8deae5c to 9a9b6d7 Compare January 19, 2018 09:44

lisitsyn merged commit c0cb4a7 into shogun-toolbox:develop Jan 19, 2018

karlnapf mentioned this pull request Jan 23, 2018

finish BSD license header transition #4111

Closed

karlnapf pushed a commit to karlnapf/shogun that referenced this pull request Feb 4, 2018

Change header files of non-GPL licensed code (shogun-toolbox#4032)

f6d2db0

sorig deleted the bsd_change branch February 20, 2018 10:22

ktiefe pushed a commit to ktiefe/shogun that referenced this pull request Jul 30, 2019

Change header files of non-GPL licensed code (shogun-toolbox#4032)

fd59118

Change header files of non-GPL licensed code #4032

Change header files of non-GPL licensed code #4032

Conversation

sorig commented Dec 17, 2017

lisitsyn commented Dec 17, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lisitsyn commented Dec 17, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

karlnapf commented Dec 22, 2017

sorig commented Dec 25, 2017 • edited

sorig commented Dec 25, 2017 • edited

sorig commented Dec 25, 2017

karlnapf commented Dec 25, 2017

karlnapf commented Jan 5, 2018

sorig commented Jan 18, 2018

karlnapf commented Jan 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

karlnapf commented Jan 18, 2018

sorig commented Jan 19, 2018

karlnapf commented Jan 19, 2018

karlnapf commented Jan 21, 2018

karlnapf commented Jan 22, 2018

karlnapf commented Jan 22, 2018

karlnapf commented Jan 23, 2018

sorig commented Jan 25, 2018 • edited

karlnapf commented Jan 25, 2018

sorig commented Dec 25, 2017 •

edited

sorig commented Dec 25, 2017 •

edited

sorig commented Jan 25, 2018 •

edited