Skip to content

Commit

Permalink
Merge pull request #173 from hellwue/patch-1
Browse files Browse the repository at this point in the history
Changed text to new MIT License
  • Loading branch information
xgdgsc authored Jan 17, 2024
2 parents e6c57a2 + da75fc4 commit d0ff838
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/MATLAB/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ URL: http://peterwittek.github.io/somoclu/

BugReports: https://github.com/peterwittek/somoclu/issues

License: GPL-3
License: MIT

OS_type: unix, windows

Expand Down
4 changes: 2 additions & 2 deletions src/Python/doc/source/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Peter Wittek, Shi Chao Gao, Ik Soo Lim, Li Zhao (2017). Somoclu: An Efficient Pa

Copyright and License
---------------------
Somoclu is free software; you can redistribute it and/or modify it under the terms of the `GNU General Public License <http://www.gnu.org/licenses/gpl-3.0.html>`_ as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
Somoclu is free software; you can redistribute it and/or modify it under the terms of the `MIT License <https://opensource.org/license/mit/>`_ as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.

Somoclu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the `GNU General Public License <http://www.gnu.org/licenses/gpl-3.0.html>`_ for more details.
Somoclu is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the `MIT License <https://opensource.org/license/mit/>`_ for more details.


Acknowledgment
Expand Down
8 changes: 4 additions & 4 deletions src/Python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def build_extensions(self):
try:
setup(name='somoclu',
version='1.7.6',
license='GPL3',
license='MIT',
author="Peter Wittek, Shi Chao Gao",
author_email="",
maintainer="shichaogao",
Expand All @@ -160,7 +160,7 @@ def build_extensions(self):
packages=["somoclu"],
install_requires=['numpy', 'matplotlib', 'scipy'],
classifiers=[
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Development Status :: 5 - Production/Stable',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand All @@ -176,7 +176,7 @@ def build_extensions(self):
traceback.print_exc()
setup(name='somoclu',
version='1.7.6',
license='GPL3',
license='MIT',
author="Peter Wittek, Shi Chao Gao",
author_email="",
maintainer="shichaogao",
Expand All @@ -186,7 +186,7 @@ def build_extensions(self):
description="Massively parallel implementation of self-organizing maps",
packages=["somoclu"],
classifiers=[
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Development Status :: 5 - Production/Stable',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand Down
2 changes: 1 addition & 1 deletion src/R/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Authors@R: c(person(given = "Peter", family = "Wittek", role = c("aut"), email =
Description: Somoclu is a massively parallel implementation of self-organizing maps. It exploits multicore CPUs and it can be accelerated by CUDA. The topology of the map can be planar or toroid and the grid of neurons can be rectangular or hexagonal . Details refer to (Peter Wittek, et al (2017)) <doi:10.18637/jss.v078.i09>.
URL: https://peterwittek.github.io/somoclu/
BugReports: https://github.com/peterwittek/somoclu/issues
License: GPL-3
License: MIT
Packaged: 2014-03-16 16:55:16 UTC;
Author: Peter Wittek [aut], Shichao Gao [cre]
Maintainer: Shichao Gao <[email protected]>
Expand Down

0 comments on commit d0ff838

Please sign in to comment.