I'm going to commit it today later if there's no objection, thanks.
On Tue, Dec 27, 2022 at 10:15:13AM +0800, Kevin Lo wrote:
>
> Ping?
>
> On Sun, Dec 18, 2022 at 06:48:09PM +0800, Kevin Lo wrote:
> >
> > Hi,
> >
> > This updates arm-compute-library to 22.11. Changes are listed here
> > https://arm-software.github.io/ComputeLibrary/v22.11/versions_changelogs.xhtml#S2_2_changelog
> >
> > ok?
> >
> > Index: devel/arm-compute-library/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -u -p -r1.8 Makefile
> > --- devel/arm-compute-library/Makefile 13 Sep 2022 08:59:48 -0000
> > 1.8
> > +++ devel/arm-compute-library/Makefile 18 Dec 2022 10:39:29 -0000
> > @@ -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 <ke...@openbsd.or
> >
> > 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
> >
> > Index: devel/arm-compute-library/distinfo
> > ===================================================================
> > RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
> > retrieving revision 1.5
> > diff -u -p -u -p -r1.5 distinfo
> > --- devel/arm-compute-library/distinfo 13 Sep 2022 08:59:48 -0000
> > 1.5
> > +++ devel/arm-compute-library/distinfo 18 Dec 2022 10:39:29 -0000
> > @@ -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
> > Index: devel/arm-compute-library/patches/patch-SConscript
> > ===================================================================
> > RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 patch-SConscript
> > --- devel/arm-compute-library/patches/patch-SConscript 13 Sep 2022
> > 08:59:48 -0000 1.6
> > +++ devel/arm-compute-library/patches/patch-SConscript 18 Dec 2022
> > 10:39:29 -0000
> > @@ -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'])
> >
> > Index: devel/arm-compute-library/patches/patch-SConstruct
> > ===================================================================
> > RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 patch-SConstruct
> > --- devel/arm-compute-library/patches/patch-SConstruct 13 Sep 2022
> > 08:59:48 -0000 1.6
> > +++ devel/arm-compute-library/patches/patch-SConstruct 18 Dec 2022
> > 10:39:29 -0000
> > @@ -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)
> > Index: devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp
> > ===================================================================
> > RCS file: devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp
> > diff -N devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp
> > --- /dev/null 1 Jan 1970 00:00:00 -0000
> > +++ devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp 18 Dec
> > 2022 10:39:29 -0000
> > @@ -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);
> > + }
> > +
> > Index: devel/arm-compute-library/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/devel/arm-compute-library/pkg/PLIST,v
> > retrieving revision 1.5
> > diff -u -p -u -p -r1.5 PLIST
> > --- devel/arm-compute-library/pkg/PLIST 13 Jul 2022 08:12:21 -0000
> > 1.5
> > +++ devel/arm-compute-library/pkg/PLIST 18 Dec 2022 10:39:29 -0000
> > @@ -113,6 +113,19 @@ include/arm_compute/core/utils/misc/Trai
> > 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
> >
>