Hi, This updates arm-compute-library to 22.05. Changes are listed here [1]. ok?
[1] https://arm-software.github.io/ComputeLibrary/v22.05/versions_changelogs.xhtml#S2_2_changelog Index: devel/arm-compute-library/Makefile =================================================================== RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- devel/arm-compute-library/Makefile 31 Mar 2022 16:39:08 -0000 1.6 +++ devel/arm-compute-library/Makefile 13 Jul 2022 00:31:26 -0000 @@ -2,9 +2,8 @@ ONLY_FOR_ARCHS = aarch64 COMMENT = Arm compute library -V = 22.02 +V = 22.05 PKGNAME = arm-compute-library-${V} -REVISION = 0 GH_ACCOUNT = ARM-software GH_PROJECT = ComputeLibrary @@ -17,13 +16,11 @@ HOMEPAGE = https://github.com/ARM-softwa MAINTAINER = Kevin Lo <ke...@openbsd.org> SO_VERSION = 2.0 -ACL_LIBS = arm_compute \ - arm_compute_core \ - arm_compute_graph +COMPUTE_SO_V = 3.0 -.for _lib in ${ACL_LIBS} -SHARED_LIBS += ${_lib} ${SO_VERSION} -.endfor +SHARED_LIBS += arm_compute ${COMPUTE_SO_V} +SHARED_LIBS += arm_compute_core ${SO_VERSION} +SHARED_LIBS += arm_compute_graph ${SO_VERSION} # MIT PERMIT_PACKAGE= Yes @@ -49,15 +46,19 @@ do-install: cp -R ${WRKSRC}/${dir} ${PREFIX}/include .endfor cp -R ${WRKSRC}/include/* ${PREFIX}/include -.for _lib in ${ACL_LIBS} - ${INSTALL_DATA} ${WRKSRC}/build/lib${_lib}.so \ - ${PREFIX}/lib/lib${_lib}.so.${SO_VERSION} -.endfor + ${INSTALL_DATA} ${WRKSRC}/build/libarm_compute.so \ + ${PREFIX}/lib/libarm_compute.so.${COMPUTE_SO_V} + ${INSTALL_DATA} ${WRKSRC}/build/libarm_compute_core.so \ + ${PREFIX}/lib/libarm_compute_core.so.${SO_VERSION} + ${INSTALL_DATA} ${WRKSRC}/build/libarm_compute_graph.so \ + ${PREFIX}/lib/libarm_compute_graph.so.${SO_VERSION} ${INSTALL_DATA} ${WRKSRC}/build/*.a ${PREFIX}/lib ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/arm-compute-library ${INSTALL_DATA} ${WRKSRC}/examples/*.{h,cpp} \ ${PREFIX}/share/examples/arm-compute-library - cp -R ${WRKSRC}/examples/gemm_tuner \ +.for dir in dynamic_fusion gemm_tuner + cp -R ${WRKSRC}/examples/${dir} \ ${PREFIX}/share/examples/arm-compute-library +.endfor .include <bsd.port.mk> Index: devel/arm-compute-library/distinfo =================================================================== RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- devel/arm-compute-library/distinfo 29 Mar 2022 08:06:01 -0000 1.3 +++ devel/arm-compute-library/distinfo 13 Jul 2022 00:31:26 -0000 @@ -1,2 +1,2 @@ -SHA256 (ComputeLibrary-22.02.tar.gz) = ESRLBSWfscSvc4TQwzka6t3siqwUR3QgdYLbSEJyZUA= -SIZE (ComputeLibrary-22.02.tar.gz) = 12990648 +SHA256 (ComputeLibrary-22.05.tar.gz) = lOLp/4fCYanJmHvJAkxEnEgBT3/nBzEb36drh/PdpcU= +SIZE (ComputeLibrary-22.05.tar.gz) = 13119545 Index: devel/arm-compute-library/patches/patch-SConscript =================================================================== RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-SConscript --- devel/arm-compute-library/patches/patch-SConscript 29 Mar 2022 08:06:01 -0000 1.4 +++ devel/arm-compute-library/patches/patch-SConscript 13 Jul 2022 00:31:26 -0000 @@ -1,7 +1,7 @@ Index: SConscript --- SConscript.orig +++ SConscript -@@ -610,7 +610,7 @@ else: +@@ -623,7 +623,7 @@ else: elif 'sve' in env['arch']: lib_files += lib_files_sve @@ -10,7 +10,7 @@ Index: SConscript Export('arm_compute_a') -@@ -629,7 +629,7 @@ if env['os'] == 'macos': +@@ -642,7 +642,7 @@ if env['os'] == 'macos': # macos static library archiver fails if given an empty list of files arm_compute_core_a = build_library('arm_compute_core-static', arm_compute_env, lib_files, static=True) else: @@ -19,7 +19,7 @@ Index: SConscript Export('arm_compute_core_a') -@@ -642,7 +642,7 @@ arm_compute_graph_env = arm_compute_env.Clone() +@@ -655,7 +655,7 @@ arm_compute_graph_env = arm_compute_env.Clone() # Build graph libraries arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', '-Wno-pessimizing-move']) Index: devel/arm-compute-library/patches/patch-SConstruct =================================================================== RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-SConstruct --- devel/arm-compute-library/patches/patch-SConstruct 29 Mar 2022 08:06:01 -0000 1.4 +++ devel/arm-compute-library/patches/patch-SConstruct 13 Jul 2022 00:31:26 -0000 @@ -1,7 +1,7 @@ Index: SConstruct --- SConstruct.orig +++ SConstruct -@@ -215,17 +215,8 @@ c_compiler = os.environ.get('CC', default_c_compiler) +@@ -228,17 +228,8 @@ c_compiler = os.environ.get('CC', default_c_compiler) if env['os'] == 'android' and ( 'clang++' not in cpp_compiler or 'clang' not in c_compiler ): print( "WARNING: Only clang is officially supported to build the Compute Library for Android") @@ -9,8 +9,8 @@ Index: SConstruct - env.Append(CXXFLAGS = ['-Wno-vla-extension']) -elif 'armclang' in cpp_compiler: - pass --else: -- env.Append(CXXFLAGS = ['-Wlogical-op','-Wnoexcept','-Wstrict-null-sentinel', '-Wno-misleading-indentation']) +-elif not 'windows' in env['os']: +- env.Append(CXXFLAGS = ['-Wlogical-op','-Wnoexcept','-Wstrict-null-sentinel','-Wno-misleading-indentation']) +env.Append(CXXFLAGS = ['-Wno-vla-extension']) -if cpp_compiler == 'g++': @@ -20,7 +20,7 @@ Index: SConstruct if env['cppthreads']: env.Append(CPPDEFINES = [('ARM_COMPUTE_CPP_SCHEDULER', 1)]) -@@ -352,25 +343,6 @@ if not GetOption("help"): +@@ -373,25 +364,6 @@ if not GetOption("help"): except OSError: print("ERROR: Compiler '%s' not found" % env['CXX']) Exit(1) @@ -44,5 +44,5 @@ Index: SConstruct - if not version_at_least(compiler_ver, '7.0.0') and env['os'] == 'bare_metal': - env.Append(LINKFLAGS = ['-fstack-protector-strong']) - if env['high_priority'] and env['build_config']: - print("The high priority library cannot be built in conjunction with a user-specified build configuration") + # For NDK >= r21, clang 9 or above is used + if env['os'] == 'android' and version_at_least(compiler_ver, '9.0.0'): Index: devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_conv_pooling_pooling_depthfirst_generic_hpp =================================================================== RCS file: devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_conv_pooling_pooling_depthfirst_generic_hpp diff -N devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_conv_pooling_pooling_depthfirst_generic_hpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_conv_pooling_pooling_depthfirst_generic_hpp 13 Jul 2022 00:31:26 -0000 @@ -0,0 +1,13 @@ +Index: src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst_generic.hpp +--- src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst_generic.hpp.orig ++++ src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst_generic.hpp +@@ -27,7 +27,9 @@ + #include "arm_compute/core/Error.h" + #include "depthfirst_driver.hpp" + #include "utils.hpp" ++#if !defined(_WIN64) && !defined(__OpenBSD__) + #include <alloca.h> ++#endif /* !defined(_WIN64) && !defined(__OpenBSD__) */ + + namespace arm_conv { + namespace pooling { Index: devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_conv_pooling_pooling_depthfirst_hpp =================================================================== RCS file: devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_conv_pooling_pooling_depthfirst_hpp diff -N devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_conv_pooling_pooling_depthfirst_hpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_conv_pooling_pooling_depthfirst_hpp 13 Jul 2022 00:31:26 -0000 @@ -0,0 +1,13 @@ +Index: src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst.hpp +--- src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst.hpp.orig ++++ src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst.hpp +@@ -28,7 +28,9 @@ + #include "src/core/NEON/kernels/arm_conv/addressing.hpp" + #include "utils.hpp" + ++#if !defined(_WIN64) && !defined(__OpenBSD__) + #include <alloca.h> ++#endif /* !defined(_WIN64) && !defined(__OpenBSD__) */ + #include <limits> + + namespace arm_conv { Index: devel/arm-compute-library/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/arm-compute-library/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- devel/arm-compute-library/pkg/PLIST 29 Mar 2022 08:06:01 -0000 1.4 +++ devel/arm-compute-library/pkg/PLIST 13 Jul 2022 00:31:26 -0000 @@ -79,7 +79,11 @@ include/arm_compute/core/Window.h include/arm_compute/core/Window.inl include/arm_compute/core/WindowIterator.h include/arm_compute/core/experimental/ +include/arm_compute/core/experimental/ClWorkload.h +include/arm_compute/core/experimental/DependencyGraph.h include/arm_compute/core/experimental/IPostOp.h +include/arm_compute/core/experimental/IWorkload.h +include/arm_compute/core/experimental/OperatorGraph.h include/arm_compute/core/experimental/PostOps.h include/arm_compute/core/experimental/Types.h include/arm_compute/core/utils/ @@ -316,6 +320,7 @@ include/arm_compute/runtime/CL/functions include/arm_compute/runtime/CL/functions/CLPadLayer.h include/arm_compute/runtime/CL/functions/CLPermute.h include/arm_compute/runtime/CL/functions/CLPixelWiseMultiplication.h +include/arm_compute/runtime/CL/functions/CLPooling3dLayer.h include/arm_compute/runtime/CL/functions/CLPoolingLayer.h include/arm_compute/runtime/CL/functions/CLPriorBoxLayer.h include/arm_compute/runtime/CL/functions/CLQLSTMLayer.h @@ -442,6 +447,7 @@ include/arm_compute/runtime/NEON/functio include/arm_compute/runtime/NEON/functions/NEPadLayer.h include/arm_compute/runtime/NEON/functions/NEPermute.h include/arm_compute/runtime/NEON/functions/NEPixelWiseMultiplication.h +include/arm_compute/runtime/NEON/functions/NEPooling3dLayer.h include/arm_compute/runtime/NEON/functions/NEPoolingLayer.h include/arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h include/arm_compute/runtime/NEON/functions/NEQLSTMLayer.h @@ -486,6 +492,7 @@ include/arm_compute/runtime/Types.h include/arm_compute/runtime/common/ include/arm_compute/runtime/common/LSTMParams.h include/arm_compute/runtime/experimental/ +include/arm_compute/runtime/experimental/ClCompositeOperator.h include/arm_compute/runtime/experimental/Types.h include/half/ include/half/half.hpp @@ -497,6 +504,7 @@ include/support/ include/support/Bfloat16.h include/support/CRTP.h include/support/Cast.h +include/support/DeepCopy.h include/support/Half.h include/support/ICloneable.h include/support/Iterable.h @@ -536,6 +544,9 @@ include/utils/command_line/ToggleOption. share/examples/arm-compute-library/ share/examples/arm-compute-library/cl_cache.cpp share/examples/arm-compute-library/cl_sgemm.cpp +share/examples/arm-compute-library/dynamic_fusion/ +share/examples/arm-compute-library/dynamic_fusion/cl_fused_conv2d_elementwise_add.cpp +share/examples/arm-compute-library/dynamic_fusion/cl_ref_conv2d_elementwise_add.cpp share/examples/arm-compute-library/gemm_tuner/ share/examples/arm-compute-library/gemm_tuner/CommonGemmExampleOptions.cpp share/examples/arm-compute-library/gemm_tuner/CommonGemmExampleOptions.h
