From 6956dbb7e46f3faecafebfbd024574000d4edef8 Mon Sep 17 00:00:00 2001 From: Harry Baker Date: Fri, 12 May 2023 14:54:52 +0100 Subject: [PATCH 1/9] Update license in tests source files --- tests/__init__.py | 36 +++++++++++++++++++------------- tests/conftest.py | 36 +++++++++++++++++++------------- tests/test_config.py | 36 +++++++++++++++++++------------- tests/test_datasets.py | 36 +++++++++++++++++++------------- tests/test_fcn.py | 36 +++++++++++++++++++------------- tests/test_logger.py | 36 +++++++++++++++++++------------- tests/test_metrics.py | 36 +++++++++++++++++++------------- tests/test_modelio.py | 36 +++++++++++++++++++------------- tests/test_models_core.py | 36 +++++++++++++++++++------------- tests/test_models_depreciated.py | 36 +++++++++++++++++++------------- tests/test_optimisers.py | 36 +++++++++++++++++++------------- tests/test_pytorchtools.py | 36 +++++++++++++++++++------------- tests/test_resnets.py | 36 +++++++++++++++++++------------- tests/test_runner.py | 36 +++++++++++++++++++------------- tests/test_samplers.py | 36 +++++++++++++++++++------------- tests/test_siamese.py | 36 +++++++++++++++++++------------- tests/test_trainer.py | 36 +++++++++++++++++++------------- tests/test_transforms.py | 36 +++++++++++++++++++------------- tests/test_unet.py | 36 +++++++++++++++++++------------- tests/test_utils.py | 36 +++++++++++++++++++------------- tests/test_visutils.py | 36 +++++++++++++++++++------------- 21 files changed, 441 insertions(+), 315 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index 1aa720329..f665126f8 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/conftest.py b/tests/conftest.py index 594062cbe..545d7162d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_config.py b/tests/test_config.py index 314b53a09..cbe22df25 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_datasets.py b/tests/test_datasets.py index 97a3fd9e8..e45278271 100644 --- a/tests/test_datasets.py +++ b/tests/test_datasets.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_fcn.py b/tests/test_fcn.py index bd76fc68e..77d5787be 100644 --- a/tests/test_fcn.py +++ b/tests/test_fcn.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_logger.py b/tests/test_logger.py index 06ed53bcc..88a1fac66 100644 --- a/tests/test_logger.py +++ b/tests/test_logger.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_metrics.py b/tests/test_metrics.py index 08a9745fb..c682182bf 100644 --- a/tests/test_metrics.py +++ b/tests/test_metrics.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_modelio.py b/tests/test_modelio.py index d1ab8d2c4..835a0b4e3 100644 --- a/tests/test_modelio.py +++ b/tests/test_modelio.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_models_core.py b/tests/test_models_core.py index 5dc003cc5..d7600ba54 100644 --- a/tests/test_models_core.py +++ b/tests/test_models_core.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_models_depreciated.py b/tests/test_models_depreciated.py index fc559305c..cc5b76950 100644 --- a/tests/test_models_depreciated.py +++ b/tests/test_models_depreciated.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_optimisers.py b/tests/test_optimisers.py index 1da966446..a125e2960 100644 --- a/tests/test_optimisers.py +++ b/tests/test_optimisers.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_pytorchtools.py b/tests/test_pytorchtools.py index 711d7df90..493b94416 100644 --- a/tests/test_pytorchtools.py +++ b/tests/test_pytorchtools.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_resnets.py b/tests/test_resnets.py index d1c3e02e1..ff9325068 100644 --- a/tests/test_resnets.py +++ b/tests/test_resnets.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_runner.py b/tests/test_runner.py index 185bc4c5a..8a57fa443 100644 --- a/tests/test_runner.py +++ b/tests/test_runner.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_samplers.py b/tests/test_samplers.py index 3eb03fbae..e73bab6cb 100644 --- a/tests/test_samplers.py +++ b/tests/test_samplers.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_siamese.py b/tests/test_siamese.py index 8bfce9254..e6969f654 100644 --- a/tests/test_siamese.py +++ b/tests/test_siamese.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_trainer.py b/tests/test_trainer.py index 1b28012c7..1b03b6992 100644 --- a/tests/test_trainer.py +++ b/tests/test_trainer.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_transforms.py b/tests/test_transforms.py index 2c46644e2..cd5b5a042 100644 --- a/tests/test_transforms.py +++ b/tests/test_transforms.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_unet.py b/tests/test_unet.py index afe9d7212..66479050d 100644 --- a/tests/test_unet.py +++ b/tests/test_unet.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_utils.py b/tests/test_utils.py index 9e450ee1b..ebf9756df 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. diff --git a/tests/test_visutils.py b/tests/test_visutils.py index ef64608c7..0988a54cd 100644 --- a/tests/test_visutils.py +++ b/tests/test_visutils.py @@ -1,19 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Harry Baker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program in LICENSE.txt. If not, -# see . +# MIT License + +# Copyright (c) 2023 Harry Baker + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # @org: University of Southampton # Created under a project funded by the Ordnance Survey Ltd. From 87c7e483862d0c07d7c44b862647f1f4ad3386be Mon Sep 17 00:00:00 2001 From: Harry Baker Date: Fri, 12 May 2023 14:55:51 +0100 Subject: [PATCH 2/9] Updated `pre-commit.ci` badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f3ff67d8c..d9a32d8d1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Minerva -![GitHub release (latest by date)](https://img.shields.io/github/v/release/Pale-Blue-Dot-97/Minerva?) ![GitHub](https://img.shields.io/github/license/Pale-Blue-Dot-97/Minerva?) ![GitHub Pipenv locked Python version](https://img.shields.io/github/pipenv/locked/python-version/Pale-Blue-Dot-97/Minerva?) ![GitHub contributors](https://img.shields.io/github/contributors/Pale-Blue-Dot-97/Minerva?) ![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/Pale-Blue-Dot-97/Minerva?) ![tests](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/tests.yml/badge.svg) [![Read the Docs](https://img.shields.io/readthedocs/smp?)](https://pale-blue-dot-97.github.io/Minerva/) [![Qodana](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml/badge.svg)](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml) [![CircleCI](https://dl.circleci.com/status-badge/img/gh/Pale-Blue-Dot-97/Minerva/tree/main.svg?style=svg&circle-token=7c738d256a0d8df674b2682daeb2f4b52381ced4)](https://dl.circleci.com/status-badge/redirect/gh/Pale-Blue-Dot-97/Minerva/tree/main) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Coverage Status](https://coveralls.io/repos/github/Pale-Blue-Dot-97/Minerva/badge.svg?t=ZycdOW)](https://coveralls.io/github/Pale-Blue-Dot-97/Minerva) [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit)[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Pale-Blue-Dot-97/Minerva/main.svg?badge_token=3TtyNVaESs6kij02bGEejA)](https://results.pre-commit.ci/latest/github/Pale-Blue-Dot-97/Minerva/main?badge_token=3TtyNVaESs6kij02bGEejA) +![GitHub release (latest by date)](https://img.shields.io/github/v/release/Pale-Blue-Dot-97/Minerva?) ![GitHub](https://img.shields.io/github/license/Pale-Blue-Dot-97/Minerva?) ![GitHub Pipenv locked Python version](https://img.shields.io/github/pipenv/locked/python-version/Pale-Blue-Dot-97/Minerva?) ![GitHub contributors](https://img.shields.io/github/contributors/Pale-Blue-Dot-97/Minerva?) ![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/Pale-Blue-Dot-97/Minerva?) ![tests](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/tests.yml/badge.svg) [![Read the Docs](https://img.shields.io/readthedocs/smp?)](https://pale-blue-dot-97.github.io/Minerva/) [![Qodana](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml/badge.svg)](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml) [![CircleCI](https://dl.circleci.com/status-badge/img/gh/Pale-Blue-Dot-97/Minerva/tree/main.svg?style=svg&circle-token=7c738d256a0d8df674b2682daeb2f4b52381ced4)](https://dl.circleci.com/status-badge/redirect/gh/Pale-Blue-Dot-97/Minerva/tree/main) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Coverage Status](https://coveralls.io/repos/github/Pale-Blue-Dot-97/Minerva/badge.svg?t=ZycdOW)](https://coveralls.io/github/Pale-Blue-Dot-97/Minerva) [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit)[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Pale-Blue-Dot-97/Minerva/main.svg)](https://results.pre-commit.ci/latest/github/Pale-Blue-Dot-97/Minerva/main)
From 49f664a175601ac7ff35a5422ea2ff942cf4e077 Mon Sep 17 00:00:00 2001 From: Harry Baker Date: Fri, 12 May 2023 14:56:40 +0100 Subject: [PATCH 3/9] Added `type: ignore[override]` for overrides --- minerva/datasets.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minerva/datasets.py b/minerva/datasets.py index dac774b49..157b2da8d 100644 --- a/minerva/datasets.py +++ b/minerva/datasets.py @@ -167,7 +167,7 @@ def __getitem__( # type: ignore[override] queries[1] ) - def __and__(self, other: "PairedDataset") -> IntersectionDataset: + def __and__(self, other: "PairedDataset") -> IntersectionDataset: # type: ignore[override] """Take the intersection of two :class:`PairedDataset`. Args: @@ -191,7 +191,7 @@ def __and__(self, other: "PairedDataset") -> IntersectionDataset: self, other, collate_fn=utils.pair_collate(concat_samples) ) - def __or__(self, other: "PairedDataset") -> "PairedUnionDataset": + def __or__(self, other: "PairedDataset") -> "PairedUnionDataset": # type: ignore[override] """Take the union of two :class:`PairedDataset`. Args: @@ -307,7 +307,7 @@ def __init__(self, *args, **kwargs) -> None: self.datasets = new_datasets - def __getitem__( + def __getitem__( # type: ignore[override] self, query: Tuple[BoundingBox, BoundingBox] ) -> Tuple[Dict[str, Any], Dict[str, Any]]: """Retrieve image and metadata indexed by query. From 2db2f3f568576a3f1ec28e3697df60487ea30bf6 Mon Sep 17 00:00:00 2001 From: Harry Baker Date: Fri, 12 May 2023 15:04:45 +0100 Subject: [PATCH 4/9] Fixed `mypy` errors --- minerva/trainer.py | 2 +- tests/conftest.py | 8 ++++++-- tests/test_modelio.py | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/minerva/trainer.py b/minerva/trainer.py index d08a39d57..e3f9c9ccb 100644 --- a/minerva/trainer.py +++ b/minerva/trainer.py @@ -420,7 +420,7 @@ def __init__( # Python 3.11+ is not yet supported though, hence the exception clause. if Version(torch.__version__) > Version("2.0.0"): # pragma: no cover try: - _compiled_model = torch.compile(self.model) + _compiled_model = torch.compile(self.model) # type: ignore[attr-defined] assert isinstance(_compiled_model, (MinervaModel, MinervaDataParallel)) self.model = _compiled_model except RuntimeError as err: diff --git a/tests/conftest.py b/tests/conftest.py index 545d7162d..357e1a195 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -164,7 +164,9 @@ def exp_cnn(x_entropy_loss, rgbi_input_size) -> MinervaModel: @pytest.fixture def random_mask(small_patch_size, std_n_classes) -> NDArray[Shape["32, 32"], Int]: - return np.random.randint(0, std_n_classes - 1, size=small_patch_size) + mask = np.random.randint(0, std_n_classes - 1, size=small_patch_size) + assert isinstance(mask, np.ndarray) + return mask @pytest.fixture @@ -212,7 +214,9 @@ def random_mask_batch( @pytest.fixture def random_scene_classification_batch(std_batch_size, std_n_classes) -> LongTensor: - return torch.randint(0, std_n_classes - 1, size=(std_batch_size,)) + batch = torch.randint(0, std_n_classes - 1, size=(std_batch_size,)) + assert isinstance(batch, LongTensor) + return batch @pytest.fixture diff --git a/tests/test_modelio.py b/tests/test_modelio.py index 835a0b4e3..c7e82019a 100644 --- a/tests/test_modelio.py +++ b/tests/test_modelio.py @@ -91,7 +91,7 @@ def test_sup_tg( std_n_classes, *rgbi_input_size[1:], ) - assert_array_equal(results[2].detach().cpu(), batch["mask"].detach().cpu()) + assert_array_equal(results[2].detach().cpu(), batch["mask"].detach().cpu()) # type: ignore[union-attr] assert results[3] == batch["bbox"] @@ -177,7 +177,7 @@ def test_mask_autoencoder_io( std_n_classes, *rgbi_input_size[1:], ) - assert_array_equal(results[2].detach().cpu(), batch["mask"].detach().cpu()) + assert_array_equal(results[2].detach().cpu(), batch["mask"].detach().cpu()) # type: ignore[union-attr] assert results[3] == batch["bbox"] @@ -211,5 +211,5 @@ def test_image_autoencoder_io( assert isinstance(results[0], Tensor) assert isinstance(results[1], Tensor) assert results[1].size() == (std_batch_size, *rgbi_input_size) - assert_array_equal(results[2].detach().cpu(), batch["image"].detach().cpu()) + assert_array_equal(results[2].detach().cpu(), batch["image"].detach().cpu()) # type: ignore[union-attr] assert results[3] == batch["bbox"] From 79867bbb4ba5bd4a9e82d6e0e55416f6e066899f Mon Sep 17 00:00:00 2001 From: Harry Baker Date: Fri, 12 May 2023 15:06:59 +0100 Subject: [PATCH 5/9] `flake8` fixes --- tests/test_logger.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_logger.py b/tests/test_logger.py index 88a1fac66..75a2d452e 100644 --- a/tests/test_logger.py +++ b/tests/test_logger.py @@ -45,7 +45,6 @@ import numpy as np import torch -import torch.nn.modules as nn from urllib3.exceptions import MaxRetryError, NewConnectionError # Needed to avoid connection error when importing lightly. @@ -120,7 +119,9 @@ def test_STGLogger( data: List[Dict[str, Union[Tensor, List[Any]]]] = [] for i in range(std_n_batches): images = torch.rand(size=(std_batch_size, 4, *small_patch_size)) - masks = torch.randint(0, std_n_classes, (std_batch_size, *small_patch_size)) # type: ignore[attr-defined] + masks = torch.randint( # type: ignore[attr-defined] + 0, std_n_classes, (std_batch_size, *small_patch_size) + ) bboxes = [simple_bbox] * std_batch_size batch: Dict[str, Union[Tensor, List[Any]]] = { "image": images, From 491bd5582ab3edaa63d25d83007364408a0a0a75 Mon Sep 17 00:00:00 2001 From: Harry Baker Date: Fri, 12 May 2023 15:10:55 +0100 Subject: [PATCH 6/9] `minerva v0.24` --- README.md | 4 ++-- banner.txt | 2 +- docs/docs_readme.md | 23 +++++++++++++++-------- minerva/__init__.py | 2 +- pyproject.toml | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index d9a32d8d1..56b160369 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Logo

- v0.23-beta + v0.24
Explore the docs ยป
@@ -145,6 +145,6 @@ Proceedings of the 2019 Conference on Computer Vision and Pattern Recognition (C ## Project Status ๐Ÿ”ด๐ŸŸก๐ŸŸข -This project is in a *beta* state. Expect bugs and breaking changes in future versions. +This project is now in release *beta* state. Still expect some bugs and there may be breaking changes in future versions.

(back to top)

diff --git a/banner.txt b/banner.txt index e9c253c1e..da6307003 100644 --- a/banner.txt +++ b/banner.txt @@ -4,4 +4,4 @@ * * / / / // // /| / /___/ _, _/| |/ / ___ | * * /_/ /_/___/_/ |_/_____/_/ |_| |___/_/ |_| * * THE REMOTE SENSING MACHINE LEARNING FRAMEWORK - ==============> v0.23.4-beta <=============== + =================> v0.24.0 <================= diff --git a/docs/docs_readme.md b/docs/docs_readme.md index 7d7c898a6..56b160369 100644 --- a/docs/docs_readme.md +++ b/docs/docs_readme.md @@ -1,6 +1,6 @@ # Minerva -![GitHub release (latest by date)](https://img.shields.io/github/v/release/Pale-Blue-Dot-97/Minerva?) ![GitHub](https://img.shields.io/github/license/Pale-Blue-Dot-97/Minerva?) ![GitHub Pipenv locked Python version](https://img.shields.io/github/pipenv/locked/python-version/Pale-Blue-Dot-97/Minerva?) ![GitHub contributors](https://img.shields.io/github/contributors/Pale-Blue-Dot-97/Minerva?) ![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/Pale-Blue-Dot-97/Minerva?) ![tests](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/tests.yml/badge.svg) [![Read the Docs](https://img.shields.io/readthedocs/smp?)](https://pale-blue-dot-97.github.io/Minerva/) [![Qodana](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml/badge.svg)](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml) [![CircleCI](https://dl.circleci.com/status-badge/img/gh/Pale-Blue-Dot-97/Minerva/tree/main.svg?style=svg&circle-token=7c738d256a0d8df674b2682daeb2f4b52381ced4)](https://dl.circleci.com/status-badge/redirect/gh/Pale-Blue-Dot-97/Minerva/tree/main) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Coverage Status](https://coveralls.io/repos/github/Pale-Blue-Dot-97/Minerva/badge.svg?t=ZycdOW)](https://coveralls.io/github/Pale-Blue-Dot-97/Minerva) [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit)[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Pale-Blue-Dot-97/Minerva/main.svg?badge_token=3TtyNVaESs6kij02bGEejA)](https://results.pre-commit.ci/latest/github/Pale-Blue-Dot-97/Minerva/main?badge_token=3TtyNVaESs6kij02bGEejA) +![GitHub release (latest by date)](https://img.shields.io/github/v/release/Pale-Blue-Dot-97/Minerva?) ![GitHub](https://img.shields.io/github/license/Pale-Blue-Dot-97/Minerva?) ![GitHub Pipenv locked Python version](https://img.shields.io/github/pipenv/locked/python-version/Pale-Blue-Dot-97/Minerva?) ![GitHub contributors](https://img.shields.io/github/contributors/Pale-Blue-Dot-97/Minerva?) ![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/Pale-Blue-Dot-97/Minerva?) ![tests](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/tests.yml/badge.svg) [![Read the Docs](https://img.shields.io/readthedocs/smp?)](https://pale-blue-dot-97.github.io/Minerva/) [![Qodana](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml/badge.svg)](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml) [![CircleCI](https://dl.circleci.com/status-badge/img/gh/Pale-Blue-Dot-97/Minerva/tree/main.svg?style=svg&circle-token=7c738d256a0d8df674b2682daeb2f4b52381ced4)](https://dl.circleci.com/status-badge/redirect/gh/Pale-Blue-Dot-97/Minerva/tree/main) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Coverage Status](https://coveralls.io/repos/github/Pale-Blue-Dot-97/Minerva/badge.svg?t=ZycdOW)](https://coveralls.io/github/Pale-Blue-Dot-97/Minerva) [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit)[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Pale-Blue-Dot-97/Minerva/main.svg)](https://results.pre-commit.ci/latest/github/Pale-Blue-Dot-97/Minerva/main)
@@ -9,7 +9,7 @@ Logo

- v0.23-beta + v0.24
Explore the docs ยป
@@ -22,8 +22,7 @@ ## About ๐Ÿ”Ž -Minerva is a package to aid in the building, fitting and testing of neural network models on geo-spatial -rasterised land cover data. +Minerva is a package to aid in the building, fitting and testing of neural network models on multi-spectral geo-spatial data. ## Getting Started โ–ถ @@ -106,7 +105,7 @@ Don't forget to give the project a star! Thanks again! ## License ๐Ÿ” -Minerva is distributed under a [GNU LGPLv3 License](https://choosealicense.com/licenses/lgpl-3.0/). +Minerva is distributed under a [MIT License](https://choosealicense.com/licenses/mit/).

(back to top)

@@ -122,11 +121,19 @@ Contributions also provided by: - [Isabel Sargent](https://github.com/PenguinJunk) - [Steve Coupland](https://github.com/scoupland-os) - [Joe Guyatt](https://github.com/joeguyatt97) +- [Ben Dickens](https://github.com/BenDickens) +- [Kitty Varghese](https://github.com/kittyvarghese) ## Acknowledgments ๐Ÿ“ข -I'd like to acknowledge the invaluable supervision and contributions of Prof Jonathon Hare and -Dr Isabel Sargent towards this work. +I'd like to acknowledge the invaluable supervision and contributions of [Prof Jonathon Hare](https://github.com/jonhare) and +[Dr Isabel Sargent](https://github.com/PenguinJunk) towards this work. + +The following modules are adapted from open source third-parites: +| Module | Original Author | License | Link | +|:-------|:----------------|:--------|:-----| +| `pytorchtools` | [Noah Golmant](https://github.com/noahgolmant) | MIT | https://github.com/noahgolmant/pytorch-lars/blob/master/lars.py | +| `optimisers` | [Bjarte Mehus Sunde](https://github.com/Bjarten) | MIT | https://github.com/Bjarten/early-stopping-pytorch | This repositry also contains two small ``.tiff`` exercpts from the [ChesapeakeCVPR](https://lila.science/datasets/chesapeakelandcover) dataset used for unit testing purposes. Credit for this data goes to: @@ -138,6 +145,6 @@ Proceedings of the 2019 Conference on Computer Vision and Pattern Recognition (C ## Project Status ๐Ÿ”ด๐ŸŸก๐ŸŸข -This project is in a *beta* state. Expect bugs and breaking changes in future versions. +This project is now in release *beta* state. Still expect some bugs and there may be breaking changes in future versions.

(back to top)

diff --git a/minerva/__init__.py b/minerva/__init__.py index 6ee793904..23e614bc7 100644 --- a/minerva/__init__.py +++ b/minerva/__init__.py @@ -42,7 +42,7 @@ Proceedings of the 2019 Conference on Computer Vision and Pattern Recognition (CVPR 2019) """ -__version__ = "0.23.4" +__version__ = "0.24.0" __author__ = "Harry Baker" __contact__ = "hjb1d20@soton.ac.uk" __license__ = "MIT License" diff --git a/pyproject.toml b/pyproject.toml index 21bd98ab4..d37047e7f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "minerva" -version = "0.23.4" +version = "0.24.0" description = "Package to build, train and test neural network models on geospatial data" readme = "README.md" authors = [ From 1b72212b6f6bdbd8e7631dbb784fff32e6b4a6a9 Mon Sep 17 00:00:00 2001 From: Harry Baker Date: Fri, 12 May 2023 15:18:10 +0100 Subject: [PATCH 7/9] Added CodeFactor badge --- README.md | 2 +- docs/docs_readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 56b160369..de18bbd94 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Minerva -![GitHub release (latest by date)](https://img.shields.io/github/v/release/Pale-Blue-Dot-97/Minerva?) ![GitHub](https://img.shields.io/github/license/Pale-Blue-Dot-97/Minerva?) ![GitHub Pipenv locked Python version](https://img.shields.io/github/pipenv/locked/python-version/Pale-Blue-Dot-97/Minerva?) ![GitHub contributors](https://img.shields.io/github/contributors/Pale-Blue-Dot-97/Minerva?) ![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/Pale-Blue-Dot-97/Minerva?) ![tests](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/tests.yml/badge.svg) [![Read the Docs](https://img.shields.io/readthedocs/smp?)](https://pale-blue-dot-97.github.io/Minerva/) [![Qodana](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml/badge.svg)](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml) [![CircleCI](https://dl.circleci.com/status-badge/img/gh/Pale-Blue-Dot-97/Minerva/tree/main.svg?style=svg&circle-token=7c738d256a0d8df674b2682daeb2f4b52381ced4)](https://dl.circleci.com/status-badge/redirect/gh/Pale-Blue-Dot-97/Minerva/tree/main) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Coverage Status](https://coveralls.io/repos/github/Pale-Blue-Dot-97/Minerva/badge.svg?t=ZycdOW)](https://coveralls.io/github/Pale-Blue-Dot-97/Minerva) [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit)[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Pale-Blue-Dot-97/Minerva/main.svg)](https://results.pre-commit.ci/latest/github/Pale-Blue-Dot-97/Minerva/main) +![GitHub release (latest by date)](https://img.shields.io/github/v/release/Pale-Blue-Dot-97/Minerva?) ![GitHub](https://img.shields.io/github/license/Pale-Blue-Dot-97/Minerva?) ![GitHub Pipenv locked Python version](https://img.shields.io/github/pipenv/locked/python-version/Pale-Blue-Dot-97/Minerva?) ![GitHub contributors](https://img.shields.io/github/contributors/Pale-Blue-Dot-97/Minerva?) [![CodeFactor](https://www.codefactor.io/repository/github/pale-blue-dot-97/minerva/badge)](https://www.codefactor.io/repository/github/pale-blue-dot-97/minerva) ![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/Pale-Blue-Dot-97/Minerva?) ![tests](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/tests.yml/badge.svg) [![Read the Docs](https://img.shields.io/readthedocs/smp?)](https://pale-blue-dot-97.github.io/Minerva/) [![Qodana](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml/badge.svg)](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml) [![CircleCI](https://dl.circleci.com/status-badge/img/gh/Pale-Blue-Dot-97/Minerva/tree/main.svg?style=svg&circle-token=7c738d256a0d8df674b2682daeb2f4b52381ced4)](https://dl.circleci.com/status-badge/redirect/gh/Pale-Blue-Dot-97/Minerva/tree/main) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Coverage Status](https://coveralls.io/repos/github/Pale-Blue-Dot-97/Minerva/badge.svg?t=ZycdOW)](https://coveralls.io/github/Pale-Blue-Dot-97/Minerva) [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit) [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Pale-Blue-Dot-97/Minerva/main.svg)](https://results.pre-commit.ci/latest/github/Pale-Blue-Dot-97/Minerva/main)
diff --git a/docs/docs_readme.md b/docs/docs_readme.md index 56b160369..de18bbd94 100644 --- a/docs/docs_readme.md +++ b/docs/docs_readme.md @@ -1,6 +1,6 @@ # Minerva -![GitHub release (latest by date)](https://img.shields.io/github/v/release/Pale-Blue-Dot-97/Minerva?) ![GitHub](https://img.shields.io/github/license/Pale-Blue-Dot-97/Minerva?) ![GitHub Pipenv locked Python version](https://img.shields.io/github/pipenv/locked/python-version/Pale-Blue-Dot-97/Minerva?) ![GitHub contributors](https://img.shields.io/github/contributors/Pale-Blue-Dot-97/Minerva?) ![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/Pale-Blue-Dot-97/Minerva?) ![tests](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/tests.yml/badge.svg) [![Read the Docs](https://img.shields.io/readthedocs/smp?)](https://pale-blue-dot-97.github.io/Minerva/) [![Qodana](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml/badge.svg)](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml) [![CircleCI](https://dl.circleci.com/status-badge/img/gh/Pale-Blue-Dot-97/Minerva/tree/main.svg?style=svg&circle-token=7c738d256a0d8df674b2682daeb2f4b52381ced4)](https://dl.circleci.com/status-badge/redirect/gh/Pale-Blue-Dot-97/Minerva/tree/main) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Coverage Status](https://coveralls.io/repos/github/Pale-Blue-Dot-97/Minerva/badge.svg?t=ZycdOW)](https://coveralls.io/github/Pale-Blue-Dot-97/Minerva) [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit)[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Pale-Blue-Dot-97/Minerva/main.svg)](https://results.pre-commit.ci/latest/github/Pale-Blue-Dot-97/Minerva/main) +![GitHub release (latest by date)](https://img.shields.io/github/v/release/Pale-Blue-Dot-97/Minerva?) ![GitHub](https://img.shields.io/github/license/Pale-Blue-Dot-97/Minerva?) ![GitHub Pipenv locked Python version](https://img.shields.io/github/pipenv/locked/python-version/Pale-Blue-Dot-97/Minerva?) ![GitHub contributors](https://img.shields.io/github/contributors/Pale-Blue-Dot-97/Minerva?) [![CodeFactor](https://www.codefactor.io/repository/github/pale-blue-dot-97/minerva/badge)](https://www.codefactor.io/repository/github/pale-blue-dot-97/minerva) ![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/Pale-Blue-Dot-97/Minerva?) ![tests](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/tests.yml/badge.svg) [![Read the Docs](https://img.shields.io/readthedocs/smp?)](https://pale-blue-dot-97.github.io/Minerva/) [![Qodana](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml/badge.svg)](https://github.com/Pale-Blue-Dot-97/Minerva/actions/workflows/code_quality.yml) [![CircleCI](https://dl.circleci.com/status-badge/img/gh/Pale-Blue-Dot-97/Minerva/tree/main.svg?style=svg&circle-token=7c738d256a0d8df674b2682daeb2f4b52381ced4)](https://dl.circleci.com/status-badge/redirect/gh/Pale-Blue-Dot-97/Minerva/tree/main) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Coverage Status](https://coveralls.io/repos/github/Pale-Blue-Dot-97/Minerva/badge.svg?t=ZycdOW)](https://coveralls.io/github/Pale-Blue-Dot-97/Minerva) [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit) [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Pale-Blue-Dot-97/Minerva/main.svg)](https://results.pre-commit.ci/latest/github/Pale-Blue-Dot-97/Minerva/main)
From 2b0003f3653eda06242ce5fec01f9f0660dc5714 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 14:18:47 +0000 Subject: [PATCH 8/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- minerva/utils/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minerva/utils/runner.py b/minerva/utils/runner.py index f1f5355fd..971f9214f 100644 --- a/minerva/utils/runner.py +++ b/minerva/utils/runner.py @@ -61,10 +61,10 @@ import torch import torch.distributed as dist import torch.multiprocessing as mp +import wandb from wandb.sdk.lib import RunDisabled from wandb.sdk.wandb_run import Run -import wandb from minerva.utils import CONFIG, MASTER_PARSER, utils # ===================================================================================================================== From a3d774a0d6c41801b2393c2a83fa0381c69ae523 Mon Sep 17 00:00:00 2001 From: Harry Baker Date: Sun, 14 May 2023 23:38:46 +0100 Subject: [PATCH 9/9] Removed `torch.compile` support --- minerva/trainer.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/minerva/trainer.py b/minerva/trainer.py index e3f9c9ccb..dd66f53e1 100644 --- a/minerva/trainer.py +++ b/minerva/trainer.py @@ -39,7 +39,6 @@ # IMPORTS # ===================================================================================================================== import os -import warnings from contextlib import nullcontext from pathlib import Path from typing import ( @@ -62,7 +61,6 @@ from alive_progress import alive_bar, alive_it from inputimeout import TimeoutOccurred, inputimeout from nptyping import Int, NDArray -from packaging.version import Version from torch import Tensor from torch.nn.modules import Module from torch.nn.parallel import DistributedDataParallel as DDP @@ -416,16 +414,6 @@ def __init__( ) self.model = MinervaDataParallel(self.model, DDP, device_ids=[gpu]) - # Wraps the model in `torch.compile` to speed up computation time. - # Python 3.11+ is not yet supported though, hence the exception clause. - if Version(torch.__version__) > Version("2.0.0"): # pragma: no cover - try: - _compiled_model = torch.compile(self.model) # type: ignore[attr-defined] - assert isinstance(_compiled_model, (MinervaModel, MinervaDataParallel)) - self.model = _compiled_model - except RuntimeError as err: - warnings.warn(str(err)) - def init_wandb_metrics(self) -> None: """Setups up separate step counters for :mod:`wandb` logging of train, val, etc.""" if isinstance(self.writer, Run):