The package rpms/python-annarchy.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/python-annarchy.git/commit/?id=f8769....
Change: +ExcludeArch: %{ix86} ppc64le
Thanks.
Full change: ============
commit f876920416ec68b126be32888401f058c461fccb Author: Sandro devel@penguinpee.nl Date: Thu Jun 6 10:26:58 2024 +0200
Initial package
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..622c702 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/ANNarchy-4.8.0.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..dd80b8c --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,13 @@ +upstream_project_url: https://github.com/ANNarchy/ANNarchy +copy_upstream_release_description: false + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + diff --git a/1fa00cd790857d4b1dac0498c6539ceab93757cf.patch b/1fa00cd790857d4b1dac0498c6539ceab93757cf.patch new file mode 100644 index 0000000..bdb677f --- /dev/null +++ b/1fa00cd790857d4b1dac0498c6539ceab93757cf.patch @@ -0,0 +1,440 @@ +From 1fa00cd790857d4b1dac0498c6539ceab93757cf Mon Sep 17 00:00:00 2001 +From: Helge Dinkelbach helge.dinkelbach@gmail.com +Date: Wed, 5 Jun 2024 10:35:29 +0200 +Subject: [PATCH] Fixed incorrect license stated in C++ template headers of + ANNarchy (issue #24) + +--- + ANNarchy/include/BSRInvMatrix.hpp | 2 +- + ANNarchy/include/BSRMatrix.hpp | 2 +- + ANNarchy/include/BSRMatrixCUDA.hpp | 2 +- + ANNarchy/include/COOMatrix.hpp | 2 +- + ANNarchy/include/COOMatrixCUDA.hpp | 2 +- + ANNarchy/include/CSRCMatrix.hpp | 2 +- + ANNarchy/include/CSRCMatrixCUDA.hpp | 2 +- + ANNarchy/include/CSRCMatrixCUDAT.hpp | 2 +- + ANNarchy/include/CSRCMatrixT.hpp | 2 +- + ANNarchy/include/CSRMatrix.hpp | 2 +- + ANNarchy/include/CSRMatrixCUDA.hpp | 2 +- + ANNarchy/include/DenseMatrix.hpp | 2 +- + ANNarchy/include/DenseMatrixCUDA.hpp | 2 +- + ANNarchy/include/DenseMatrixOffsets.hpp | 2 +- + ANNarchy/include/DiaMatrix.hpp | 2 +- + ANNarchy/include/ELLMatrix.hpp | 2 +- + ANNarchy/include/ELLMatrixCUDA.hpp | 2 +- + ANNarchy/include/ELLRMatrix.hpp | 2 +- + ANNarchy/include/ELLRMatrixCUDA.hpp | 2 +- + ANNarchy/include/HYBMatrix.hpp | 2 +- + ANNarchy/include/HYBMatrixCUDA.hpp | 2 +- + ANNarchy/include/LILInvMatrix.hpp | 4 ++-- + ANNarchy/include/LILMatrix.hpp | 4 ++-- + ANNarchy/include/PartitionedMatrix.hpp | 4 ++-- + ANNarchy/include/SELLMatrix.hpp | 2 +- + ANNarchy/include/SELLMatrixCUDA.hpp | 2 +- + ANNarchy/include/Specific.hpp | 4 ++-- + ANNarchy/include/VecTransformation.hpp | 2 +- + ANNarchy/include/helper_functions.hpp | 4 ++-- + 29 files changed, 34 insertions(+), 34 deletions(-) + +diff --git a/ANNarchy/include/BSRInvMatrix.hpp b/ANNarchy/include/BSRInvMatrix.hpp +index 796c8d54..127ebf6a 100644 +--- a/ANNarchy/include/BSRInvMatrix.hpp ++++ b/ANNarchy/include/BSRInvMatrix.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/BSRMatrix.hpp b/ANNarchy/include/BSRMatrix.hpp +index 4f23bf82..f7263226 100644 +--- a/ANNarchy/include/BSRMatrix.hpp ++++ b/ANNarchy/include/BSRMatrix.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/BSRMatrixCUDA.hpp b/ANNarchy/include/BSRMatrixCUDA.hpp +index 035856b0..358c4721 100644 +--- a/ANNarchy/include/BSRMatrixCUDA.hpp ++++ b/ANNarchy/include/BSRMatrixCUDA.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/COOMatrix.hpp b/ANNarchy/include/COOMatrix.hpp +index 689618d4..a7bb15c9 100644 +--- a/ANNarchy/include/COOMatrix.hpp ++++ b/ANNarchy/include/COOMatrix.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/COOMatrixCUDA.hpp b/ANNarchy/include/COOMatrixCUDA.hpp +index 4c913373..f979a9e4 100644 +--- a/ANNarchy/include/COOMatrixCUDA.hpp ++++ b/ANNarchy/include/COOMatrixCUDA.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/CSRCMatrix.hpp b/ANNarchy/include/CSRCMatrix.hpp +index 4fedf6e7..ac6ace24 100644 +--- a/ANNarchy/include/CSRCMatrix.hpp ++++ b/ANNarchy/include/CSRCMatrix.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/CSRCMatrixCUDA.hpp b/ANNarchy/include/CSRCMatrixCUDA.hpp +index 8ff29182..0fdc0fb1 100644 +--- a/ANNarchy/include/CSRCMatrixCUDA.hpp ++++ b/ANNarchy/include/CSRCMatrixCUDA.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/CSRCMatrixCUDAT.hpp b/ANNarchy/include/CSRCMatrixCUDAT.hpp +index b694ca48..6308c9ea 100644 +--- a/ANNarchy/include/CSRCMatrixCUDAT.hpp ++++ b/ANNarchy/include/CSRCMatrixCUDAT.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/CSRCMatrixT.hpp b/ANNarchy/include/CSRCMatrixT.hpp +index 939d9e7c..3a97ab39 100644 +--- a/ANNarchy/include/CSRCMatrixT.hpp ++++ b/ANNarchy/include/CSRCMatrixT.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/CSRMatrix.hpp b/ANNarchy/include/CSRMatrix.hpp +index 3a87f993..0352fd8a 100644 +--- a/ANNarchy/include/CSRMatrix.hpp ++++ b/ANNarchy/include/CSRMatrix.hpp +@@ -8,7 +8,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/CSRMatrixCUDA.hpp b/ANNarchy/include/CSRMatrixCUDA.hpp +index 1ac8fdc4..0f0c0a06 100644 +--- a/ANNarchy/include/CSRMatrixCUDA.hpp ++++ b/ANNarchy/include/CSRMatrixCUDA.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/DenseMatrix.hpp b/ANNarchy/include/DenseMatrix.hpp +index 457f21d2..10ab8cdc 100644 +--- a/ANNarchy/include/DenseMatrix.hpp ++++ b/ANNarchy/include/DenseMatrix.hpp +@@ -8,7 +8,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/DenseMatrixCUDA.hpp b/ANNarchy/include/DenseMatrixCUDA.hpp +index 58815fb1..b8547c7e 100644 +--- a/ANNarchy/include/DenseMatrixCUDA.hpp ++++ b/ANNarchy/include/DenseMatrixCUDA.hpp +@@ -8,7 +8,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/DenseMatrixOffsets.hpp b/ANNarchy/include/DenseMatrixOffsets.hpp +index fdf8b898..38feb6bc 100644 +--- a/ANNarchy/include/DenseMatrixOffsets.hpp ++++ b/ANNarchy/include/DenseMatrixOffsets.hpp +@@ -8,7 +8,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/DiaMatrix.hpp b/ANNarchy/include/DiaMatrix.hpp +index a236e8cb..db408abf 100644 +--- a/ANNarchy/include/DiaMatrix.hpp ++++ b/ANNarchy/include/DiaMatrix.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/ELLMatrix.hpp b/ANNarchy/include/ELLMatrix.hpp +index 14f55cd1..6f1a3e2c 100644 +--- a/ANNarchy/include/ELLMatrix.hpp ++++ b/ANNarchy/include/ELLMatrix.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/ELLMatrixCUDA.hpp b/ANNarchy/include/ELLMatrixCUDA.hpp +index 1768fcee..e4ac6341 100644 +--- a/ANNarchy/include/ELLMatrixCUDA.hpp ++++ b/ANNarchy/include/ELLMatrixCUDA.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/ELLRMatrix.hpp b/ANNarchy/include/ELLRMatrix.hpp +index 7d151b23..c4f0a386 100644 +--- a/ANNarchy/include/ELLRMatrix.hpp ++++ b/ANNarchy/include/ELLRMatrix.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/ELLRMatrixCUDA.hpp b/ANNarchy/include/ELLRMatrixCUDA.hpp +index c08b74d0..632c284a 100644 +--- a/ANNarchy/include/ELLRMatrixCUDA.hpp ++++ b/ANNarchy/include/ELLRMatrixCUDA.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/HYBMatrix.hpp b/ANNarchy/include/HYBMatrix.hpp +index 6d0cfc12..882ff7c6 100644 +--- a/ANNarchy/include/HYBMatrix.hpp ++++ b/ANNarchy/include/HYBMatrix.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/HYBMatrixCUDA.hpp b/ANNarchy/include/HYBMatrixCUDA.hpp +index 4a30e700..5ac66d4e 100644 +--- a/ANNarchy/include/HYBMatrixCUDA.hpp ++++ b/ANNarchy/include/HYBMatrixCUDA.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/LILInvMatrix.hpp b/ANNarchy/include/LILInvMatrix.hpp +index f9e15944..898d86d5 100644 +--- a/ANNarchy/include/LILInvMatrix.hpp ++++ b/ANNarchy/include/LILInvMatrix.hpp +@@ -4,11 +4,11 @@ + * This file is part of ANNarchy. + * + * Copyright (C) 2020 Helge Uelo Dinkelbach helge.dinkelbach@gmail.com, +- * Julien Vitay julien.vitay@gmail.com ++ * Julien Vitay julien.vitay@gmail.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/LILMatrix.hpp b/ANNarchy/include/LILMatrix.hpp +index c4634efd..04d20080 100644 +--- a/ANNarchy/include/LILMatrix.hpp ++++ b/ANNarchy/include/LILMatrix.hpp +@@ -5,11 +5,11 @@ + * This file is part of ANNarchy. + * + * Copyright (C) 2020 Helge Uelo Dinkelbach helge.dinkelbach@gmail.com, +- * Julien Vitay julien.vitay@gmail.com ++ * Julien Vitay julien.vitay@gmail.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/PartitionedMatrix.hpp b/ANNarchy/include/PartitionedMatrix.hpp +index 89a35feb..d5d80fcc 100644 +--- a/ANNarchy/include/PartitionedMatrix.hpp ++++ b/ANNarchy/include/PartitionedMatrix.hpp +@@ -4,11 +4,11 @@ + * This file is part of ANNarchy. + * + * Copyright (C) 2020 Helge Uelo Dinkelbach helge.dinkelbach@gmail.com, +- * Julien Vitay julien.vitay@gmail.com ++ * Julien Vitay julien.vitay@gmail.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/SELLMatrix.hpp b/ANNarchy/include/SELLMatrix.hpp +index 2432b7e2..07a00207 100644 +--- a/ANNarchy/include/SELLMatrix.hpp ++++ b/ANNarchy/include/SELLMatrix.hpp +@@ -8,7 +8,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/SELLMatrixCUDA.hpp b/ANNarchy/include/SELLMatrixCUDA.hpp +index a4cf5786..d114ac04 100644 +--- a/ANNarchy/include/SELLMatrixCUDA.hpp ++++ b/ANNarchy/include/SELLMatrixCUDA.hpp +@@ -8,7 +8,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/Specific.hpp b/ANNarchy/include/Specific.hpp +index a975a048..ad5edcf7 100644 +--- a/ANNarchy/include/Specific.hpp ++++ b/ANNarchy/include/Specific.hpp +@@ -4,11 +4,11 @@ + * This file is part of ANNarchy. + * + * Copyright (C) 2020 Helge Uelo Dinkelbach helge.dinkelbach@gmail.com, +- * Julien Vitay julien.vitay@gmail.com ++ * Julien Vitay julien.vitay@gmail.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/VecTransformation.hpp b/ANNarchy/include/VecTransformation.hpp +index c7e51ffa..d61ecf47 100644 +--- a/ANNarchy/include/VecTransformation.hpp ++++ b/ANNarchy/include/VecTransformation.hpp +@@ -7,7 +7,7 @@ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, +diff --git a/ANNarchy/include/helper_functions.hpp b/ANNarchy/include/helper_functions.hpp +index 6f500239..661e0534 100644 +--- a/ANNarchy/include/helper_functions.hpp ++++ b/ANNarchy/include/helper_functions.hpp +@@ -4,11 +4,11 @@ + * This file is part of ANNarchy. + * + * Copyright (C) 2020 Helge Uelo Dinkelbach helge.dinkelbach@gmail.com, +- * Julien Vitay julien.vitay@gmail.com ++ * Julien Vitay julien.vitay@gmail.com + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or ++ * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * ANNarchy is distributed in the hope that it will be useful, diff --git a/22.patch b/22.patch new file mode 100644 index 0000000..9832bf8 --- /dev/null +++ b/22.patch @@ -0,0 +1,206 @@ +From ccc7de3ca04afdf55f063bf161b72cd693b69b25 Mon Sep 17 00:00:00 2001 +From: Sandro devel@penguinpee.nl +Date: Mon, 3 Jun 2024 13:28:10 +0200 +Subject: [PATCH] Fix import and logging function used in tests + +- `s/_erroror/error/g` for lgging error messages +- Fix `_check_paradigm` import in `test_RandomVariables.py` +- Close issue #21 +--- + ANNarchy/core/Projection.py | 4 ++-- + ANNarchy/extensions/convolution/Pooling.py | 2 +- + ANNarchy/generator/Compiler.py | 4 ++-- + ANNarchy/generator/Projection/CUDAGenerator.py | 2 +- + ANNarchy/generator/Projection/SingleThreadGenerator.py | 4 ++-- + ANNarchy/inputs/DecodingProjection.py | 2 +- + ANNarchy/inputs/PoissonPopulation.py | 2 +- + ANNarchy/inputs/SpikeTrains.py | 2 +- + ANNarchy/parser/AnalyseSynapse.py | 2 +- + ANNarchy/parser/CoupledEquations.py | 2 +- + ANNarchy/parser/Function.py | 2 +- + tests/Common/test_RandomVariables.py | 2 +- + 12 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/ANNarchy/core/Projection.py b/ANNarchy/core/Projection.py +index 174412b0..0c7b98a9 100644 +--- a/ANNarchy/core/Projection.py ++++ b/ANNarchy/core/Projection.py +@@ -663,7 +663,7 @@ def nb_efferent_synapses(self): + Messages._warning("Access 'nb_efferent_synapses()' of a Projection is only valid after compile()") + return None + if self.synapse_type.type == "rate": +- Messages._erroror("Projection.nb_efferent_synapses() is not available for rate-coded projections.") ++ Messages._error("Projection.nb_efferent_synapses() is not available for rate-coded projections.") + + return self.cyInstance.nb_efferent_synapses() + +@@ -860,7 +860,7 @@ def _set_cython_attribute(self, attribute, value): + if attribute in self.synapse_type.description['local']: + for idx, n in enumerate(self.post_ranks): + if not len(value[idx]) == self.cyInstance.dendrite_size(idx): +- Messages._erroror('The post-synaptic neuron ' + str(n) + ' of population ' + str(self.post.id) + ' receives '+ str(self.cyInstance.dendrite_size(idx))+ ' synapses and not ' + str(len(value[idx])) + '.') ++ Messages._error('The post-synaptic neuron ' + str(n) + ' of population ' + str(self.post.id) + ' receives '+ str(self.cyInstance.dendrite_size(idx))+ ' synapses and not ' + str(len(value[idx])) + '.') + self.cyInstance.set_local_attribute_row(attribute, idx, value[idx], ctype) + elif attribute in self.synapse_type.description['semiglobal']: + self.cyInstance.set_semiglobal_attribute_all(attribute, value, ctype) +diff --git a/ANNarchy/extensions/convolution/Pooling.py b/ANNarchy/extensions/convolution/Pooling.py +index 3a40482e..ff117a87 100644 +--- a/ANNarchy/extensions/convolution/Pooling.py ++++ b/ANNarchy/extensions/convolution/Pooling.py +@@ -90,7 +90,7 @@ def connect_pooling(self, extent:tuple=None, delays:float=0.0): + self.extent_init = extent + if extent is None: # compute the extent automatically + if self.pre.dimension != self.post.dimension: +- Messages._erroror( ++ Messages._error( + 'Pooling: If you do not provide the extent parameter, the two populations must have the same number of dimensions.') + + extent = list(self.pre.geometry) +diff --git a/ANNarchy/generator/Compiler.py b/ANNarchy/generator/Compiler.py +index 7e79b01f..fd2aba5a 100644 +--- a/ANNarchy/generator/Compiler.py ++++ b/ANNarchy/generator/Compiler.py +@@ -301,7 +301,7 @@ def python_environment(): + if cython is None: + cython = shutil.which("cython") + if cython is None: +- Messages._erroror("Unable to detect the path to cython.") ++ Messages._error("Unable to detect the path to cython.") + + return py_version, py_major, python_include, python_lib, python_libpath, cython + +@@ -352,7 +352,7 @@ def __init__(self, annarchy_dir, clean, compiler, compiler_flags, add_sources, e + cmd = self.user_config['cuda']['compiler'] + " --version 1> /dev/null" + + if os.system(cmd) != 0: +- Messages._erroror("CUDA is not available on your system. Please check the CUDA installation or the annarchy.json configuration.") ++ Messages._error("CUDA is not available on your system. Please check the CUDA installation or the annarchy.json configuration.") + + self.cuda_config['cuda_version'] = check_cuda_version(self.user_config['cuda']['compiler']) + +diff --git a/ANNarchy/generator/Projection/CUDAGenerator.py b/ANNarchy/generator/Projection/CUDAGenerator.py +index 867edf84..51bfc7d6 100644 +--- a/ANNarchy/generator/Projection/CUDAGenerator.py ++++ b/ANNarchy/generator/Projection/CUDAGenerator.py +@@ -1418,7 +1418,7 @@ def _post_event(self, proj): + templates = self._templates['post_event'] + + except KeyError: +- raise Messages._erroror("No CUDA code template for post_event ( format =", proj._storage_format, " and order =", proj._storage_order,")") ++ raise Messages._error("No CUDA code template for post_event ( format =", proj._storage_format, " and order =", proj._storage_order,")") + + # Fill code templates + postevent_body = templates['device_kernel'] % { +diff --git a/ANNarchy/generator/Projection/SingleThreadGenerator.py b/ANNarchy/generator/Projection/SingleThreadGenerator.py +index eb9f1969..86f1e2f1 100644 +--- a/ANNarchy/generator/Projection/SingleThreadGenerator.py ++++ b/ANNarchy/generator/Projection/SingleThreadGenerator.py +@@ -988,7 +988,7 @@ def _computesum_spiking(self, proj): + template = self._templates['spiking_sum_fixed_delay'] + + if template == None: +- Messages._erroror("Code generation error: no template available") ++ Messages._error("Code generation error: no template available") + + complete_code = "" + +@@ -1360,7 +1360,7 @@ def _update_synapse(self, proj): + + except KeyError: + # either no template code at all, or no 'update_variables' field. +- Messages._erroror("No synaptic plasticity template found for format = " + proj._storage_format, " and order = " + proj._storage_order) ++ Messages._error("No synaptic plasticity template found for format = " + proj._storage_format, " and order = " + proj._storage_order) + + template_ids = deepcopy(self._template_ids) # will be extended at the end of this function + template_ids.update({ +diff --git a/ANNarchy/inputs/DecodingProjection.py b/ANNarchy/inputs/DecodingProjection.py +index 4e9b107d..c5fcee7a 100644 +--- a/ANNarchy/inputs/DecodingProjection.py ++++ b/ANNarchy/inputs/DecodingProjection.py +@@ -58,7 +58,7 @@ def __init__(self, pre:"Population", post:"Population", target:str, window:float + + # Not on CUDA + if _check_paradigm('cuda'): +- Messages._erroror('DecodingProjections are not available on CUDA yet.') ++ Messages._error('DecodingProjections are not available on CUDA yet.') + + def _copy(self, pre, post): + "Returns a copy of the population when creating networks. Internal use only." +diff --git a/ANNarchy/inputs/PoissonPopulation.py b/ANNarchy/inputs/PoissonPopulation.py +index 6263b9e3..a0966de0 100644 +--- a/ANNarchy/inputs/PoissonPopulation.py ++++ b/ANNarchy/inputs/PoissonPopulation.py +@@ -99,7 +99,7 @@ def __init__(self, + copied:bool=False): + + if rates is None and target is None: +- Messages._erroror('A PoissonPopulation must define either rates or target.') ++ Messages._error('A PoissonPopulation must define either rates or target.') + + self.target = target + self.parameters = parameters +diff --git a/ANNarchy/inputs/SpikeTrains.py b/ANNarchy/inputs/SpikeTrains.py +index 9bc539ad..9e10d16a 100644 +--- a/ANNarchy/inputs/SpikeTrains.py ++++ b/ANNarchy/inputs/SpikeTrains.py +@@ -791,7 +791,7 @@ def __setattr__(self, name, value): + else: + value = np.array(value) + if not value.size == self.schedule.size: +- Messages._erroror("HomogeneousCorrelatedSpikeTrains: corr must have the same length as schedule.") ++ Messages._error("HomogeneousCorrelatedSpikeTrains: corr must have the same length as schedule.") + else: + value = np.array([float(value)]) + if self.initialized: +diff --git a/ANNarchy/parser/AnalyseSynapse.py b/ANNarchy/parser/AnalyseSynapse.py +index 11d22cb8..9d86d1ad 100644 +--- a/ANNarchy/parser/AnalyseSynapse.py ++++ b/ANNarchy/parser/AnalyseSynapse.py +@@ -416,7 +416,7 @@ def analyse_synapse(synapse): + elif variable in description['posz_spike']: + Messages._error('It is forbidden to use ODEs in a post_spike term.') + else: +- Messages._erroror('It is forbidden to use ODEs here.') ++ Messages._error('It is forbidden to use ODEs here.') + + # Replace untouched variables with their original name + for prev, new in sorted(list(untouched.items()), key = lambda key : len(key[0]), reverse=True): +diff --git a/ANNarchy/parser/CoupledEquations.py b/ANNarchy/parser/CoupledEquations.py +index 73d6d6f0..43dd1f72 100644 +--- a/ANNarchy/parser/CoupledEquations.py ++++ b/ANNarchy/parser/CoupledEquations.py +@@ -62,7 +62,7 @@ def parse(self): + methods.append(var['method']) + if len(list(set(methods))) > 1: # mixture of methods + Messages._print(methods) +- Messages._erroror('Can not mix different numerical methods when solving a coupled system of equations.') ++ Messages._error('Can not mix different numerical methods when solving a coupled system of equations.') + + else: + method = methods[0] +diff --git a/ANNarchy/parser/Function.py b/ANNarchy/parser/Function.py +index de349228..27b2d220 100644 +--- a/ANNarchy/parser/Function.py ++++ b/ANNarchy/parser/Function.py +@@ -91,7 +91,7 @@ def parse(self, part=None): + ) + except: + Messages._print(expression) +- Messages._erroror('The function depends on unknown variables.') ++ Messages._error('The function depends on unknown variables.') + + return sp.ccode(eq, precision=8, + user_functions=self.user_functions) +diff --git a/tests/Common/test_RandomVariables.py b/tests/Common/test_RandomVariables.py +index a0e743d4..1ceb3265 100644 +--- a/tests/Common/test_RandomVariables.py ++++ b/tests/Common/test_RandomVariables.py +@@ -24,7 +24,7 @@ + import unittest + + from ANNarchy import * +-from ANNarchy.core.Global import _check_paradigm ++from ANNarchy.intern.ConfigManagement import _check_paradigm + + class test_NeuronRandomVariables(unittest.TestCase): + """ diff --git a/python-annarchy.spec b/python-annarchy.spec new file mode 100644 index 0000000..26aed9b --- /dev/null +++ b/python-annarchy.spec @@ -0,0 +1,86 @@ +%global pypi_name ANNarchy + +# Running all tests is time consuming. Allow skipping of tests. +%bcond tests 1 + +Name: python-annarchy +Version: 4.8.0.2 +Release: %{autorelease} +Summary: Artificial Neural Networks architect + +%global forgeurl https://github.com/ANNarchy/ANNarchy +%global tag %{version} +%forgemeta + +# ANNarchy/thirdparty/randutils.hpp is MIT +License: GPL-2.0-or-later AND MIT +URL: https://annarchy.github.io/ +Source: %forgesource +# https://github.com/ANNarchy/ANNarchy/issues/21 +Patch: %{forgeurl}/pull/22.patch +# Fix license preambles in header files +# https://github.com/ANNarchy/ANNarchy/issues/24 +Patch: %{forgeurl}/commit/1fa00cd790857d4b1dac0498c6539ceab93757cf.patch + +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +# Tests fail on ppc64le (under investigation) +ExcludeArch: %{ix86} ppc64le +BuildRequires: gcc-c++ +BuildRequires: python3-devel +%if %{with tests} +BuildRequires: python3dist(pytest) +%endif + +%global _description %{expand: +ANNarchy 🏴 (Artificial Neural Networks architect) is a parallel and +hybrid simulator for distributed rate-coded or spiking neural networks. +The core of the library is written in C++ and distributed using OpenMP +or CUDA. It provides an interface in Python for the definition of the +networks. + +NOTE: Since CUDA support requires proprietary Nvidia drivers, this +package only supports OpenMP and single thread.} + +%description %_description + + +%package -n python3-annarchy +Summary: %{summary} +Requires: (flexiblas-openblas-openmp or openblas-openmp) +# Also `tensorflow` and `tensorboardX` (not availabale in Fedora) +Recommends: python3dist(lxml) +Recommends: pandoc + +%description -n python3-annarchy %_description + + +%prep +%forgeautosetup -p1 + + +%generate_buildrequires +%pyproject_buildrequires + + +%build +%pyproject_wheel + + +%install +%pyproject_install +%pyproject_save_files -l %{pypi_name} + + +%check +%if %{with tests} +%pytest -v tests/test_openmp.py +%pytest -v tests/test_single_thread.py +%endif + + +%files -n python3-annarchy -f %{pyproject_files} +%doc README.md AUTHORS CHANGELOG + + +%changelog +%autochangelog diff --git a/sources b/sources new file mode 100644 index 0000000..e2e0f1b --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (ANNarchy-4.8.0.2.tar.gz) = 8ef1abf9769f4e4cbcdaf1591512d3411976758494588e25f267940a33cb97eb56eaaad5bce71299f4068175a62e0fd4f88c725036b06d0e7051dc97ded02c7f
arch-excludes@lists.fedoraproject.org