diff --git a/devel/arm-compute-library/Makefile b/devel/arm-compute-library/Makefile index 7dfe6e8f6b8..8d78a14d660 100644 --- a/devel/arm-compute-library/Makefile +++ b/devel/arm-compute-library/Makefile @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS = aarch64 COMMENT = Arm compute library -V = 22.08 +V = 22.11 PKGNAME = arm-compute-library-${V} GH_ACCOUNT = ARM-software @@ -17,7 +17,7 @@ MAINTAINER = Kevin Lo CORE_SO_V = 2.0 GRAPH_SO_V = 2.1 -COMPUTE_SO_V = 3.1 +COMPUTE_SO_V = 3.2 SHARED_LIBS += arm_compute ${COMPUTE_SO_V} SHARED_LIBS += arm_compute_core ${CORE_SO_V} @@ -32,7 +32,7 @@ COMPILER = base-clang ports-gcc # "build=native" here just means "not cross-compiled" MODSCONS_FLAGS = Werror=0 neon=1 opencl=0 embed_kernels=0 examples=0 \ - os=openbsd arch=arm64-v8a build=native + os=openbsd arch=armv8a build=native MODULES = devel/scons diff --git a/devel/arm-compute-library/distinfo b/devel/arm-compute-library/distinfo index 429bef342c6..851dff56af2 100644 --- a/devel/arm-compute-library/distinfo +++ b/devel/arm-compute-library/distinfo @@ -1,2 +1,2 @@ -SHA256 (ComputeLibrary-22.08.tar.gz) = rCzntWNumfF1sIQ2L4P+JNcubOsL1i7lhmdy9zVdAk0= -SIZE (ComputeLibrary-22.08.tar.gz) = 13257068 +SHA256 (ComputeLibrary-22.11.tar.gz) = 4goGDTxPgDiJ2WwvC4ZQBLo+9OIoKZpEM56hwbqCfIU= +SIZE (ComputeLibrary-22.11.tar.gz) = 13316795 diff --git a/devel/arm-compute-library/patches/patch-SConscript b/devel/arm-compute-library/patches/patch-SConscript index dcc688fdd11..fd8a4c26639 100644 --- a/devel/arm-compute-library/patches/patch-SConscript +++ b/devel/arm-compute-library/patches/patch-SConscript @@ -1,7 +1,7 @@ Index: SConscript --- SConscript.orig +++ SConscript -@@ -632,7 +632,7 @@ else: +@@ -638,7 +638,7 @@ else: elif 'sve' in env['arch']: lib_files += lib_files_sve @@ -10,7 +10,7 @@ Index: SConscript Export('arm_compute_a') -@@ -651,7 +651,7 @@ if env['os'] == 'macos': +@@ -657,7 +657,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') -@@ -664,7 +664,7 @@ arm_compute_graph_env = arm_compute_env.Clone() +@@ -670,7 +670,7 @@ arm_compute_graph_env = arm_compute_env.Clone() # Build graph libraries arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', '-Wno-pessimizing-move']) diff --git a/devel/arm-compute-library/patches/patch-SConstruct b/devel/arm-compute-library/patches/patch-SConstruct index 14da05b3000..3d233e9fd8c 100644 --- a/devel/arm-compute-library/patches/patch-SConstruct +++ b/devel/arm-compute-library/patches/patch-SConstruct @@ -1,7 +1,7 @@ Index: SConstruct --- SConstruct.orig +++ SConstruct -@@ -244,17 +244,8 @@ c_compiler = os.environ.get('CC', default_c_compiler) +@@ -245,17 +245,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") @@ -20,7 +20,7 @@ Index: SConstruct if env['cppthreads']: env.Append(CPPDEFINES = [('ARM_COMPUTE_CPP_SCHEDULER', 1)]) -@@ -406,25 +397,6 @@ if not GetOption("help"): +@@ -407,25 +398,6 @@ if not GetOption("help"): except OSError: print("ERROR: Compiler '%s' not found" % env['CXX']) Exit(1) diff --git a/devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp b/devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp new file mode 100644 index 00000000000..4af16ec9f7a --- /dev/null +++ b/devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp @@ -0,0 +1,12 @@ +Index: include/libnpy/npy.hpp +--- include/libnpy/npy.hpp.orig ++++ include/libnpy/npy.hpp +@@ -103,7 +103,7 @@ struct Typestring { + inline std::string str() { + const size_t max_buflen = 16; + char buf[max_buflen]; +- std::sprintf(buf, "%c%c%u", c_endian, c_type, len); ++ std::snprintf(buf, sizeof(buf), "%c%c%u", c_endian, c_type, len); + return std::string(buf); + } + diff --git a/devel/arm-compute-library/pkg/PLIST b/devel/arm-compute-library/pkg/PLIST index 372cbd4d42b..57073125a99 100644 --- a/devel/arm-compute-library/pkg/PLIST +++ b/devel/arm-compute-library/pkg/PLIST @@ -113,6 +113,19 @@ include/arm_compute/core/utils/misc/Traits.h include/arm_compute/core/utils/misc/Utility.h include/arm_compute/core/utils/quantization/ include/arm_compute/core/utils/quantization/AsymmHelpers.h +include/arm_compute/dynamic_fusion/ +include/arm_compute/dynamic_fusion/runtime/ +include/arm_compute/dynamic_fusion/runtime/gpu/ +include/arm_compute/dynamic_fusion/runtime/gpu/cl/ +include/arm_compute/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.h +include/arm_compute/dynamic_fusion/sketch/ +include/arm_compute/dynamic_fusion/sketch/MemoryDescriptor.h +include/arm_compute/dynamic_fusion/sketch/OperatorAttributes.h +include/arm_compute/dynamic_fusion/sketch/gpu/ +include/arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadContext.h +include/arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.h +include/arm_compute/dynamic_fusion/sketch/gpu/operators/ +include/arm_compute/dynamic_fusion/sketch/gpu/operators/GpuConv2d.h include/arm_compute/graph/ include/arm_compute/graph.h include/arm_compute/graph/DataLayerVisitor.h