Date: Thursday, March 28, 2019 @ 12:40:10 Author: kgizdov Revision: 445271
archrelease: copy trunk to community-testing-x86_64 Added: arrayfire/repos/community-testing-x86_64/2365.patch (from rev 445270, arrayfire/trunk/2365.patch) arrayfire/repos/community-testing-x86_64/PKGBUILD (from rev 445270, arrayfire/trunk/PKGBUILD) arrayfire/repos/community-testing-x86_64/doc_warn_not_error.patch (from rev 445270, arrayfire/trunk/doc_warn_not_error.patch) Deleted: arrayfire/repos/community-testing-x86_64/2365.patch arrayfire/repos/community-testing-x86_64/PKGBUILD arrayfire/repos/community-testing-x86_64/doc_warn_not_error.patch --------------------------+ 2365.patch | 296 ++++++++++++++++++++++----------------------- PKGBUILD | 135 ++++++++++---------- doc_warn_not_error.patch | 26 +-- 3 files changed, 229 insertions(+), 228 deletions(-) Deleted: 2365.patch =================================================================== --- 2365.patch 2019-03-28 12:39:38 UTC (rev 445270) +++ 2365.patch 2019-03-28 12:40:10 UTC (rev 445271) @@ -1,148 +0,0 @@ -From b25b998ea3637948914095b57c3246f8b26c6506 Mon Sep 17 00:00:00 2001 -From: pradeep <prad...@arrayfire.com> -Date: Mon, 3 Dec 2018 20:21:35 +0530 -Subject: [PATCH] Changes to use glbinding 3.0.2 and Forge 1.0.3 - -- Forge 1.0.3 uses glbinding 3.0.2 -- ArrayFire's glbinding has also been bumped up to 3.0.2 ---- - CMakeModules/build_forge.cmake | 2 +- - src/backend/common/CMakeLists.txt | 3 +- - src/backend/common/graphics_common.cpp | 43 +++++++++----------------- - src/backend/common/graphics_common.hpp | 4 --- - src/backend/opencl/platform.cpp | 1 - - 5 files changed, 17 insertions(+), 36 deletions(-) - -diff --git a/CMakeModules/build_forge.cmake b/CMakeModules/build_forge.cmake -index 7ae5a165f..97ffcec5f 100644 ---- a/CMakeModules/build_forge.cmake -+++ b/CMakeModules/build_forge.cmake -@@ -7,7 +7,7 @@ - - include(ExternalProject) - --set(FORGE_VERSION v1.0.2) -+set(FORGE_VERSION v1.0.3) - set(prefix "${ArrayFire_BINARY_DIR}/third_party/forge") - set(PX ${CMAKE_SHARED_LIBRARY_PREFIX}) - set(SX ${CMAKE_SHARED_LIBRARY_SUFFIX}) -diff --git a/src/backend/common/CMakeLists.txt b/src/backend/common/CMakeLists.txt -index 4aa0b4949..6f608d05f 100644 ---- a/src/backend/common/CMakeLists.txt -+++ b/src/backend/common/CMakeLists.txt -@@ -105,7 +105,8 @@ if(AF_WITH_GRAPHICS) - # glbindings cmake file - target_link_libraries(afcommon_interface - INTERFACE -- $<TARGET_PROPERTY:glbinding::glbinding,IMPORTED_LOCATION_RELEASE>) -+ $<TARGET_PROPERTY:glbinding::glbinding,IMPORTED_LOCATION_RELEASE> -+ ) - else() - target_link_libraries(afcommon_interface INTERFACE glbinding::glbinding) - endif() -diff --git a/src/backend/common/graphics_common.cpp b/src/backend/common/graphics_common.cpp -index 3cbc83b7a..a574bc962 100644 ---- a/src/backend/common/graphics_common.cpp -+++ b/src/backend/common/graphics_common.cpp -@@ -10,7 +10,6 @@ - #if defined(WITH_GRAPHICS) - - #include <common/graphics_common.hpp> --#include <glbinding/Meta.h> - #include <common/err_common.hpp> - #include <backend.hpp> - #include <platform.hpp> -@@ -51,30 +50,28 @@ INSTANTIATE_GET_FG_TYPE(unsigned char , forge::u8); - INSTANTIATE_GET_FG_TYPE(unsigned short , forge::u16); - INSTANTIATE_GET_FG_TYPE(short , forge::s16); - --gl::GLenum glErrorSkip(const char *msg, const char* file, int line) --{ --#ifndef NDEBUG -- gl::GLenum x = gl::glGetError(); -- if (x != GL_NO_ERROR) { -- char buf[1024]; -- sprintf(buf, "GL Error Skipped at: %s:%d Message: %s Error Code: %d \"%s\"\n", file, line, msg, (int)x, glbinding::Meta::getString(x).c_str()); -- AF_ERROR(buf, AF_ERR_INTERNAL); -- } -- return x; --#else -- return (gl::GLenum)0; --#endif --} -- - gl::GLenum glErrorCheck(const char *msg, const char* file, int line) - { -+ auto getErrorString = [](gl::GLenum value) { -+ switch(value) { -+ case GLenum::GL_INVALID_ENUM: return "GL_INVALID_ENUM"; -+ case GLenum::GL_INVALID_VALUE: return "GL_INVALID_VALUE"; -+ case GLenum::GL_INVALID_OPERATION: return "GL_INVALID_OPERATION"; -+ case GLenum::GL_INVALID_FRAMEBUFFER_OPERATION: return "GL_INVALID_FRAMEBUFFER_OPERATION"; -+ case GLenum::GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY"; -+ case GLenum::GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW"; -+ case GLenum::GL_STACK_OVERFLOW: return "GL_STACK_OVERFLOW"; -+ default: return "GL_NO_ERROR"; -+ } -+ }; - // Skipped in release mode - #ifndef NDEBUG - gl::GLenum x = gl::glGetError(); - - if (x != GL_NO_ERROR) { - char buf[1024]; -- sprintf(buf, "GL Error at: %s:%d Message: %s Error Code: %d \"%s\"\n", file, line, msg, (int)x, glbinding::Meta::getString(x).c_str()); -+ sprintf(buf, "GL Error at: %s:%d Message: %s Error Code: %d \"%s\"\n", -+ file, line, msg, (int)x, getErrorString(x).c_str()); - AF_ERROR(buf, AF_ERR_INTERNAL); - } - return x; -@@ -83,18 +80,6 @@ gl::GLenum glErrorCheck(const char *msg, const char* file, int line) - #endif - } - --gl::GLenum glForceErrorCheck(const char *msg, const char* file, int line) --{ -- gl::GLenum x = gl::glGetError(); -- -- if (x != GL_NO_ERROR) { -- char buf[1024]; -- sprintf(buf, "GL Error at: %s:%d Message: %s Error Code: %d \"%s\"\n", file, line, msg, (int)x, glbinding::Meta::getString(x).c_str()); -- AF_ERROR(buf, AF_ERR_INTERNAL); -- } -- return x; --} -- - size_t getTypeSize(gl::GLenum type) - { - switch(type) { -diff --git a/src/backend/common/graphics_common.hpp b/src/backend/common/graphics_common.hpp -index e895f5c90..e9e1ec43c 100644 ---- a/src/backend/common/graphics_common.hpp -+++ b/src/backend/common/graphics_common.hpp -@@ -27,13 +27,9 @@ forge::dtype getGLType(); - - // Print for OpenGL errors - // Returns 1 if an OpenGL error occurred, 0 otherwise. --gl::GLenum glErrorSkip(const char *msg, const char* file, int line); - gl::GLenum glErrorCheck(const char *msg, const char* file, int line); --gl::GLenum glForceErrorCheck(const char *msg, const char* file, int line); - - #define CheckGL(msg) glErrorCheck (msg, __AF_FILENAME__, __LINE__) --#define ForceCheckGL(msg) glForceErrorCheck(msg, __AF_FILENAME__, __LINE__) --#define CheckGLSkip(msg) glErrorSkip (msg, __AF_FILENAME__, __LINE__) - - forge::MarkerType getFGMarker(const af_marker_type af_marker); - -diff --git a/src/backend/opencl/platform.cpp b/src/backend/opencl/platform.cpp -index 226d5967c..b29145443 100644 ---- a/src/backend/opencl/platform.cpp -+++ b/src/backend/opencl/platform.cpp -@@ -29,7 +29,6 @@ - #include <err_opencl.hpp> - #include <blas.hpp> - #include <common/host_memory.hpp> --#include <common/InteropManager.hpp> - #include <platform.hpp> - #include <common/util.hpp> - #include <version.hpp> Copied: arrayfire/repos/community-testing-x86_64/2365.patch (from rev 445270, arrayfire/trunk/2365.patch) =================================================================== --- 2365.patch (rev 0) +++ 2365.patch 2019-03-28 12:40:10 UTC (rev 445271) @@ -0,0 +1,148 @@ +From b25b998ea3637948914095b57c3246f8b26c6506 Mon Sep 17 00:00:00 2001 +From: pradeep <prad...@arrayfire.com> +Date: Mon, 3 Dec 2018 20:21:35 +0530 +Subject: [PATCH] Changes to use glbinding 3.0.2 and Forge 1.0.3 + +- Forge 1.0.3 uses glbinding 3.0.2 +- ArrayFire's glbinding has also been bumped up to 3.0.2 +--- + CMakeModules/build_forge.cmake | 2 +- + src/backend/common/CMakeLists.txt | 3 +- + src/backend/common/graphics_common.cpp | 43 +++++++++----------------- + src/backend/common/graphics_common.hpp | 4 --- + src/backend/opencl/platform.cpp | 1 - + 5 files changed, 17 insertions(+), 36 deletions(-) + +diff --git a/CMakeModules/build_forge.cmake b/CMakeModules/build_forge.cmake +index 7ae5a165f..97ffcec5f 100644 +--- a/CMakeModules/build_forge.cmake ++++ b/CMakeModules/build_forge.cmake +@@ -7,7 +7,7 @@ + + include(ExternalProject) + +-set(FORGE_VERSION v1.0.2) ++set(FORGE_VERSION v1.0.3) + set(prefix "${ArrayFire_BINARY_DIR}/third_party/forge") + set(PX ${CMAKE_SHARED_LIBRARY_PREFIX}) + set(SX ${CMAKE_SHARED_LIBRARY_SUFFIX}) +diff --git a/src/backend/common/CMakeLists.txt b/src/backend/common/CMakeLists.txt +index 4aa0b4949..6f608d05f 100644 +--- a/src/backend/common/CMakeLists.txt ++++ b/src/backend/common/CMakeLists.txt +@@ -105,7 +105,8 @@ if(AF_WITH_GRAPHICS) + # glbindings cmake file + target_link_libraries(afcommon_interface + INTERFACE +- $<TARGET_PROPERTY:glbinding::glbinding,IMPORTED_LOCATION_RELEASE>) ++ $<TARGET_PROPERTY:glbinding::glbinding,IMPORTED_LOCATION_RELEASE> ++ ) + else() + target_link_libraries(afcommon_interface INTERFACE glbinding::glbinding) + endif() +diff --git a/src/backend/common/graphics_common.cpp b/src/backend/common/graphics_common.cpp +index 3cbc83b7a..a574bc962 100644 +--- a/src/backend/common/graphics_common.cpp ++++ b/src/backend/common/graphics_common.cpp +@@ -10,7 +10,6 @@ + #if defined(WITH_GRAPHICS) + + #include <common/graphics_common.hpp> +-#include <glbinding/Meta.h> + #include <common/err_common.hpp> + #include <backend.hpp> + #include <platform.hpp> +@@ -51,30 +50,28 @@ INSTANTIATE_GET_FG_TYPE(unsigned char , forge::u8); + INSTANTIATE_GET_FG_TYPE(unsigned short , forge::u16); + INSTANTIATE_GET_FG_TYPE(short , forge::s16); + +-gl::GLenum glErrorSkip(const char *msg, const char* file, int line) +-{ +-#ifndef NDEBUG +- gl::GLenum x = gl::glGetError(); +- if (x != GL_NO_ERROR) { +- char buf[1024]; +- sprintf(buf, "GL Error Skipped at: %s:%d Message: %s Error Code: %d \"%s\"\n", file, line, msg, (int)x, glbinding::Meta::getString(x).c_str()); +- AF_ERROR(buf, AF_ERR_INTERNAL); +- } +- return x; +-#else +- return (gl::GLenum)0; +-#endif +-} +- + gl::GLenum glErrorCheck(const char *msg, const char* file, int line) + { ++ auto getErrorString = [](gl::GLenum value) { ++ switch(value) { ++ case GLenum::GL_INVALID_ENUM: return "GL_INVALID_ENUM"; ++ case GLenum::GL_INVALID_VALUE: return "GL_INVALID_VALUE"; ++ case GLenum::GL_INVALID_OPERATION: return "GL_INVALID_OPERATION"; ++ case GLenum::GL_INVALID_FRAMEBUFFER_OPERATION: return "GL_INVALID_FRAMEBUFFER_OPERATION"; ++ case GLenum::GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY"; ++ case GLenum::GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW"; ++ case GLenum::GL_STACK_OVERFLOW: return "GL_STACK_OVERFLOW"; ++ default: return "GL_NO_ERROR"; ++ } ++ }; + // Skipped in release mode + #ifndef NDEBUG + gl::GLenum x = gl::glGetError(); + + if (x != GL_NO_ERROR) { + char buf[1024]; +- sprintf(buf, "GL Error at: %s:%d Message: %s Error Code: %d \"%s\"\n", file, line, msg, (int)x, glbinding::Meta::getString(x).c_str()); ++ sprintf(buf, "GL Error at: %s:%d Message: %s Error Code: %d \"%s\"\n", ++ file, line, msg, (int)x, getErrorString(x).c_str()); + AF_ERROR(buf, AF_ERR_INTERNAL); + } + return x; +@@ -83,18 +80,6 @@ gl::GLenum glErrorCheck(const char *msg, const char* file, int line) + #endif + } + +-gl::GLenum glForceErrorCheck(const char *msg, const char* file, int line) +-{ +- gl::GLenum x = gl::glGetError(); +- +- if (x != GL_NO_ERROR) { +- char buf[1024]; +- sprintf(buf, "GL Error at: %s:%d Message: %s Error Code: %d \"%s\"\n", file, line, msg, (int)x, glbinding::Meta::getString(x).c_str()); +- AF_ERROR(buf, AF_ERR_INTERNAL); +- } +- return x; +-} +- + size_t getTypeSize(gl::GLenum type) + { + switch(type) { +diff --git a/src/backend/common/graphics_common.hpp b/src/backend/common/graphics_common.hpp +index e895f5c90..e9e1ec43c 100644 +--- a/src/backend/common/graphics_common.hpp ++++ b/src/backend/common/graphics_common.hpp +@@ -27,13 +27,9 @@ forge::dtype getGLType(); + + // Print for OpenGL errors + // Returns 1 if an OpenGL error occurred, 0 otherwise. +-gl::GLenum glErrorSkip(const char *msg, const char* file, int line); + gl::GLenum glErrorCheck(const char *msg, const char* file, int line); +-gl::GLenum glForceErrorCheck(const char *msg, const char* file, int line); + + #define CheckGL(msg) glErrorCheck (msg, __AF_FILENAME__, __LINE__) +-#define ForceCheckGL(msg) glForceErrorCheck(msg, __AF_FILENAME__, __LINE__) +-#define CheckGLSkip(msg) glErrorSkip (msg, __AF_FILENAME__, __LINE__) + + forge::MarkerType getFGMarker(const af_marker_type af_marker); + +diff --git a/src/backend/opencl/platform.cpp b/src/backend/opencl/platform.cpp +index 226d5967c..b29145443 100644 +--- a/src/backend/opencl/platform.cpp ++++ b/src/backend/opencl/platform.cpp +@@ -29,7 +29,6 @@ + #include <err_opencl.hpp> + #include <blas.hpp> + #include <common/host_memory.hpp> +-#include <common/InteropManager.hpp> + #include <platform.hpp> + #include <common/util.hpp> + #include <version.hpp> Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-03-28 12:39:38 UTC (rev 445270) +++ PKGBUILD 2019-03-28 12:40:10 UTC (rev 445271) @@ -1,67 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -pkgname=arrayfire -pkgdesc="High performance software library for parallel computing with an easy-to-use API" -url='https://arrayfire.com' -pkgver=3.6.2 -arch=('x86_64') -pkgrel=1 -license=('BSD') -depends=('cblas' 'fftw' 'boost-libs' 'lapacke' 'forge' 'freeimage' 'glfw' 'glew' 'glbinding') -makedepends=('cmake' 'graphviz' 'doxygen' 'opencl-headers' 'boost' 'python' 'ocl-icd' 'cuda' 'git') -optdepends=('cuda: Required for using CUDA backend' - 'nvidia-utils: Required for using CUDA backend' - 'libclc: Required for using OpenCL backend') -options=('!buildflags') -source=("http://arrayfire.com/arrayfire_source/arrayfire-full-${pkgver}.tar.bz2" - "2365.patch" - 'doc_warn_not_error.patch') -sha512sums=('02fef093eb819b503449812d033695995502f513973f25fa2fee5a904a7198e6191470ccbb7ac1c8281e3b89f61da89e1df7958215b261fc3017f6ab4643ff07' - 'b0bb4b9e5a69c960dbed51838be4855b1eed030a9e68072807685029f0673bcfad8253614d19b2d1ec70a9082a4cf09f84601ebdedf275223cebfac5bd41f9d1' - '63c745da51347fc94e02b031cb0606216f523acc350866658ebed7ac09115217a934285ecb731391f11c2934984f106564153eaca1b9c6d578db2b0904c0741d') - -prepare() { - cd "${srcdir}/arrayfire-full-${pkgver}" - - patch -Np1 -i "${srcdir}"/2365.patch - patch -Np1 -i "${srcdir}/doc_warn_not_error.patch" - - mkdir -p build -} - -build() { - cd "${srcdir}/arrayfire-full-${pkgver}" - - cd build - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DAF_USE_SYSTEM_FORGE=ON \ - -DAF_WITH_IMAGEIO=ON \ - -DAF_WITH_GRAPHICS=ON \ - -DAF_BUILD_CPU=ON \ - -DAF_BUILD_OPENCL=ON \ - -DAF_BUILD_NONFREE=ON \ - -DAF_BUILD_EXAMPLES=ON \ - -DAF_BUILD_DOCS=ON \ - -DCUDA_architecture_build_targets="3.0;3.2;3.5;3.7;5.0;5.2;5.3;6.0;6.1;6.2;7.0;7.2;7.5" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCUDA_HOST_COMPILER=/usr/bin/gcc - - make -} - -# check() { -# cd "${srcdir}/arrayfire-full-${pkgver}/build" -# -# # Some tests fail :( -# make test -# } - -package() { - cd "${srcdir}/arrayfire-full-${pkgver}" - - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - cd build - - make DESTDIR="${pkgdir}/" install -} Copied: arrayfire/repos/community-testing-x86_64/PKGBUILD (from rev 445270, arrayfire/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-03-28 12:40:10 UTC (rev 445271) @@ -0,0 +1,68 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +pkgname=arrayfire +pkgdesc="High performance software library for parallel computing with an easy-to-use API" +url='https://arrayfire.com' +pkgver=3.6.2 +arch=('x86_64') +pkgrel=2 +license=('BSD') +depends=('cblas' 'fftw' 'boost-libs' 'lapacke' 'forge' 'freeimage' 'glfw' 'glew' 'glbinding') +makedepends=('cmake' 'graphviz' 'doxygen' 'opencl-headers' 'boost' 'python' 'ocl-icd' 'cuda' 'git') +optdepends=('cuda: Required for using CUDA backend' + 'nvidia-utils: Required for using CUDA backend' + 'libclc: Required for using OpenCL backend') +options=('!buildflags') +source=("http://arrayfire.com/arrayfire_source/arrayfire-full-${pkgver}.tar.bz2" + "2365.patch" + 'doc_warn_not_error.patch') +sha512sums=('02fef093eb819b503449812d033695995502f513973f25fa2fee5a904a7198e6191470ccbb7ac1c8281e3b89f61da89e1df7958215b261fc3017f6ab4643ff07' + 'b0bb4b9e5a69c960dbed51838be4855b1eed030a9e68072807685029f0673bcfad8253614d19b2d1ec70a9082a4cf09f84601ebdedf275223cebfac5bd41f9d1' + '63c745da51347fc94e02b031cb0606216f523acc350866658ebed7ac09115217a934285ecb731391f11c2934984f106564153eaca1b9c6d578db2b0904c0741d') + +prepare() { + cd "${srcdir}/arrayfire-full-${pkgver}" + + patch -Np1 -i "${srcdir}"/2365.patch + patch -Np1 -i "${srcdir}/doc_warn_not_error.patch" + + mkdir -p build +} + +build() { + cd "${srcdir}/arrayfire-full-${pkgver}" + + cd build + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DAF_USE_SYSTEM_FORGE=ON \ + -DAF_WITH_IMAGEIO=ON \ + -DAF_WITH_GRAPHICS=ON \ + -DAF_BUILD_CPU=ON \ + -DAF_BUILD_OPENCL=ON \ + -DAF_BUILD_NONFREE=ON \ + -DAF_BUILD_EXAMPLES=ON \ + -DAF_BUILD_DOCS=ON \ + -DCUDA_architecture_build_targets="3.0;3.2;3.5;3.7;5.0;5.2;5.3;6.0;6.1;6.2;7.0;7.2;7.5" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCUDA_HOST_COMPILER=/usr/bin/gcc + + make +} + +# check() { +# cd "${srcdir}/arrayfire-full-${pkgver}/build" +# +# # Some tests fail :( +# make test +# } + +package() { + cd "${srcdir}/arrayfire-full-${pkgver}" + + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + cd build + + make DESTDIR="${pkgdir}/" install +} Deleted: doc_warn_not_error.patch =================================================================== --- doc_warn_not_error.patch 2019-03-28 12:39:38 UTC (rev 445270) +++ doc_warn_not_error.patch 2019-03-28 12:40:10 UTC (rev 445271) @@ -1,13 +0,0 @@ -diff --git a/docs/doxygen.mk b/docs/doxygen.mk -index 5d4e0237..05c4e12c 100644 ---- a/docs/doxygen.mk -+++ b/docs/doxygen.mk -@@ -769,7 +769,7 @@ WARN_NO_PARAMDOC = YES - # a warning is encountered. - # The default value is: NO. - --WARN_AS_ERROR = YES -+WARN_AS_ERROR = NO - - # The WARN_FORMAT tag determines the format of the warning messages that doxygen - # can produce. The string should contain the $file, $line, and $text tags, which Copied: arrayfire/repos/community-testing-x86_64/doc_warn_not_error.patch (from rev 445270, arrayfire/trunk/doc_warn_not_error.patch) =================================================================== --- doc_warn_not_error.patch (rev 0) +++ doc_warn_not_error.patch 2019-03-28 12:40:10 UTC (rev 445271) @@ -0,0 +1,13 @@ +diff --git a/docs/doxygen.mk b/docs/doxygen.mk +index 5d4e0237..05c4e12c 100644 +--- a/docs/doxygen.mk ++++ b/docs/doxygen.mk +@@ -769,7 +769,7 @@ WARN_NO_PARAMDOC = YES + # a warning is encountered. + # The default value is: NO. + +-WARN_AS_ERROR = YES ++WARN_AS_ERROR = NO + + # The WARN_FORMAT tag determines the format of the warning messages that doxygen + # can produce. The string should contain the $file, $line, and $text tags, which