From 310261e1cf210004397f7f9c1ecabfc468b9bc85 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Fri, 20 Jan 2017 09:02:30 +0100 Subject: [PATCH] Switch license of OpenCL code to MIT and update Copyright --- copyright | 12 +++++++++- pyFAI/ocl_azim_csr.py | 4 ++-- pyFAI/ocl_azim_lut.py | 4 ++-- pyFAI/resources/openCL/for_eclipse.h | 2 +- pyFAI/resources/openCL/memset.cl | 26 ++++++++++++-------- pyFAI/resources/openCL/ocl_azim_CSR.cl | 29 +++++++++++++---------- pyFAI/resources/openCL/ocl_azim_LUT.cl | 29 +++++++++++++---------- pyFAI/resources/openCL/preprocess.cl | 25 +++++++++++-------- pyFAI/resources/openCL/reduction_test.cl | 28 ++++++++++++---------- pyFAI/resources/openCL/reduction_test4.cl | 25 +++++++++++-------- pyFAI/resources/openCL/separate.cl | 2 +- 11 files changed, 113 insertions(+), 73 deletions(-) diff --git a/copyright b/copyright index cb098ab4..9f4ef4cc 100644 --- a/copyright +++ b/copyright @@ -68,7 +68,17 @@ Files: setup.py pyFAI/ext/watershed.pyx pyFAI/ext/*.pxi pyFAI/ext/src/* - pyFAI/gui/* + pyFAI/resources/gui/* + pyFAI/resources/openCL/bitonic.cl + pyFAI/resources/openCL/for_eclipse.cl + pyFAI/resources/openCL/ocl_azim_CSR.cl + pyFAI/resources/openCL/memset.cl + pyFAI/resources/openCL/ocl_azim_CSR.cl + pyFAI/resources/openCL/ocl_azim_LUT.cl + pyFAI/resources/openCL/preprocess.cl + pyFAI/resources/openCL/reduction_test.cl + pyFAI/resources/openCL/reduction_test4.cl + pyFAI/resources/openCL/separate.cl pyFAI/benchmark/* pyFAI/test/test_mask.py pyFAI/test/test_integrate.py diff --git a/pyFAI/ocl_azim_csr.py b/pyFAI/ocl_azim_csr.py index 7ffaea05..29912719 100644 --- a/pyFAI/ocl_azim_csr.py +++ b/pyFAI/ocl_azim_csr.py @@ -25,7 +25,7 @@ __authors__ = ["Jérôme Kieffer", "Giannis Ashiotis"] __license__ = "GPLv3" -__date__ = "18/01/2017" +__date__ = "20/01/2017" __copyright__ = "2014-2017, ESRF, Grenoble" __contact__ = "jerome.kieffer@esrf.fr" @@ -214,7 +214,7 @@ class OCL_CSR_Integrator(object): """ # concatenate all needed source files into a single openCL module kernel_file = kernel_file or "ocl_azim_CSR.cl" - kernel_src = concatenate_cl_kernel(["preprocess.cl", kernel_file]) + kernel_src = concatenate_cl_kernel(["preprocess.cl", "memset.cl", kernel_file]) compile_options = "-D NBINS=%i -D NIMAGE=%i -D WORKGROUP_SIZE=%i -D ON_CPU=%i" % \ (self.bins, self.size, self.BLOCK_SIZE, int(self.device_type == "CPU")) diff --git a/pyFAI/ocl_azim_lut.py b/pyFAI/ocl_azim_lut.py index 4b07faf1..4d65e17f 100644 --- a/pyFAI/ocl_azim_lut.py +++ b/pyFAI/ocl_azim_lut.py @@ -23,7 +23,7 @@ __author__ = "Jerome Kieffer" __license__ = "GPLv3" -__date__ = "18/01/2017" +__date__ = "20/01/2017" __copyright__ = "2012-2017, ESRF, Grenoble" __contact__ = "jerome.kieffer@esrf.fr" @@ -199,7 +199,7 @@ class OCL_LUT_Integrator(object): """ # concatenate all needed source files into a single openCL module kernel_file = kernel_file or "ocl_azim_LUT.cl" - kernel_src = concatenate_cl_kernel(["preprocess.cl", kernel_file]) + kernel_src = concatenate_cl_kernel(["preprocess.cl", "memset.cl", kernel_file]) compile_options = "-D NBINS=%i -D NIMAGE=%i -D NLUT=%i -D ON_CPU=%i" % \ (self.bins, self.size, self.lut_size, int(self.device_type == "CPU")) diff --git a/pyFAI/resources/openCL/for_eclipse.h b/pyFAI/resources/openCL/for_eclipse.h index f8abdb8f..68703bf8 100644 --- a/pyFAI/resources/openCL/for_eclipse.h +++ b/pyFAI/resources/openCL/for_eclipse.h @@ -2,7 +2,7 @@ * Project: Azimuthal integration * https://github.com/silx-kit/pyFAI * - * Copyright (C) 2015 European Synchrotron Radiation Facility, Grenoble, France + * Copyright (C) 2015-2017 European Synchrotron Radiation Facility, Grenoble, France * * Principal author: Jerome Kieffer (Jerome.Kieffer@ESRF.eu) * diff --git a/pyFAI/resources/openCL/memset.cl b/pyFAI/resources/openCL/memset.cl index 6b58b9c8..a60958f4 100644 --- a/pyFAI/resources/openCL/memset.cl +++ b/pyFAI/resources/openCL/memset.cl @@ -9,18 +9,24 @@ * Principal authors: J. Kieffer (kieffer@esrf.fr) * Last revision: 19/01/2017 * - * 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 - * (at your option) any later version. + * 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: * - * 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 General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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. + */ /** diff --git a/pyFAI/resources/openCL/ocl_azim_CSR.cl b/pyFAI/resources/openCL/ocl_azim_CSR.cl index fe4dd027..6d98fc11 100644 --- a/pyFAI/resources/openCL/ocl_azim_CSR.cl +++ b/pyFAI/resources/openCL/ocl_azim_CSR.cl @@ -3,24 +3,29 @@ * Kernel with full pixel-split using a CSR sparse matrix * * - * Copyright (C) 2012-2014 European Synchrotron Radiation Facility + * Copyright (C) 2012-2017 European Synchrotron Radiation Facility * Grenoble, France * * Principal authors: J. Kieffer (kieffer@esrf.fr) - * Last revision: 10/10/2014 + * Last revision: 20/01/2017 * - * 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 - * (at your option) any later version. + * 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: * - * 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 General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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. */ /** diff --git a/pyFAI/resources/openCL/ocl_azim_LUT.cl b/pyFAI/resources/openCL/ocl_azim_LUT.cl index 8de78be2..01702b8f 100644 --- a/pyFAI/resources/openCL/ocl_azim_LUT.cl +++ b/pyFAI/resources/openCL/ocl_azim_LUT.cl @@ -3,24 +3,29 @@ * Kernel with full pixel-split using a LUT * * - * Copyright (C) 2012-2014 European Synchrotron Radiation Facility + * Copyright (C) 2012-2017 European Synchrotron Radiation Facility * Grenoble, France * * Principal authors: J. Kieffer (kieffer@esrf.fr) - * Last revision: 11/10/2014 + * Last revision: 20/01/2017 * - * 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 - * (at your option) any later version. + * 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: * - * 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 General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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. */ /** diff --git a/pyFAI/resources/openCL/preprocess.cl b/pyFAI/resources/openCL/preprocess.cl index 1f37e6a7..696fed66 100644 --- a/pyFAI/resources/openCL/preprocess.cl +++ b/pyFAI/resources/openCL/preprocess.cl @@ -9,18 +9,23 @@ * Principal authors: J. Kieffer (kieffer@esrf.fr) * Last revision: 19/01/2017 * - * 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 - * (at your option) any later version. + * 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: * - * 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 General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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. */ /** diff --git a/pyFAI/resources/openCL/reduction_test.cl b/pyFAI/resources/openCL/reduction_test.cl index c7647b77..f8b386b8 100644 --- a/pyFAI/resources/openCL/reduction_test.cl +++ b/pyFAI/resources/openCL/reduction_test.cl @@ -8,21 +8,25 @@ * * Principal authors: Giannis Ashiotis * J. Kieffer (kieffer@esrf.fr) - * Last revision: 20/10/2014 + * Last revision: 20/01/2017 * - * 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 - * (at your option) any later version. + * 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: * - * 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 General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ + * 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. */ #include "for_eclipse.h" diff --git a/pyFAI/resources/openCL/reduction_test4.cl b/pyFAI/resources/openCL/reduction_test4.cl index 7f42318e..a2f74d40 100644 --- a/pyFAI/resources/openCL/reduction_test4.cl +++ b/pyFAI/resources/openCL/reduction_test4.cl @@ -10,18 +10,23 @@ * J. Kieffer (kieffer@esrf.fr) * Last revision: 20/10/2014 * - * 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 - * (at your option) any later version. + * 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: * - * 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 General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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. */ #include "for_eclipse.h" diff --git a/pyFAI/resources/openCL/separate.cl b/pyFAI/resources/openCL/separate.cl index 50e855cc..1bb6b6ed 100644 --- a/pyFAI/resources/openCL/separate.cl +++ b/pyFAI/resources/openCL/separate.cl @@ -2,7 +2,7 @@ * Project: Azimuthal integration * https://github.com/silx-kit/pyFAI * - * Copyright (C) 2015 European Synchrotron Radiation Facility, Grenoble, France + * Copyright (C) 2015-2017 European Synchrotron Radiation Facility, Grenoble, France * * Principal author: Jerome Kieffer (Jerome.Kieffer@ESRF.eu) *