cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to arm-compute-library 21.11

Browse Source 
ok sthen@
This commit is contained in:
kevlo 2022-01-02 14:11:16 +00:00
parent 0f45c38f80
commit f0f9eecf8f
5 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/arm-compute-library/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2021/11/10 01:07:06 kevlo Exp $ # $OpenBSD: Makefile,v 1.3 2022/01/02 14:11:16 kevlo Exp $
ONLY_FOR_ARCHS = aarch64 ONLY_FOR_ARCHS = aarch64
COMMENT = Arm compute library COMMENT = Arm compute library
V = 21.08 V = 21.11
PKGNAME = arm-compute-library-${V} PKGNAME = arm-compute-library-${V}
GH_ACCOUNT = ARM-software GH_ACCOUNT = ARM-software
@ -17,7 +17,7 @@ HOMEPAGE = https://github.com/ARM-software/ComputeLibrary
MAINTAINER = Kevin Lo <kevlo@openbsd.org> MAINTAINER = Kevin Lo <kevlo@openbsd.org>
SO_VERSION = 0.0 SO_VERSION = 1.0
ACL_LIBS = arm_compute \ ACL_LIBS = arm_compute \
arm_compute_core \ arm_compute_core \
arm_compute_graph arm_compute_graph

4
devel/arm-compute-library/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ComputeLibrary-21.08.tar.gz) = HGLUG+YsFMj/GW1qqp+e/gWXuCqSM1DZIujN4hfdHYY= SHA256 (ComputeLibrary-21.11.tar.gz) = gyLtLhNZmVaQgqlef7svqHeG/7HGeTWz73HgC1PyyIc=
SIZE (ComputeLibrary-21.08.tar.gz) = 12921165 SIZE (ComputeLibrary-21.11.tar.gz) = 12987341

31
devel/arm-compute-library/patches/patch-SConscript
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-SConscript,v 1.1.1.1 2021/10/19 03:54:58 kevlo Exp $ $OpenBSD: patch-SConscript,v 1.2 2022/01/02 14:11:16 kevlo Exp $
Index: SConscript Index: SConscript
--- SConscript.orig --- SConscript.orig
+++ SConscript +++ SConscript
@@ -385,7 +385,8 @@ undefined_flag = '-Wl,-undefined,error' if 'macos' in @@ -422,7 +422,8 @@ undefined_flag = '-Wl,-undefined,error' if 'macos' in
arm_compute_env.Append(LINKFLAGS=[undefined_flag]) arm_compute_env.Append(LINKFLAGS=[undefined_flag])
arm_compute_env.Append(CPPPATH =[Dir("./src/core/").path] ) arm_compute_env.Append(CPPPATH =[Dir("./src/core/").path] )
@ -13,3 +13,30 @@ Index: SConscript
with (open(Dir('#').path + '/filelist.json')) as fp: with (open(Dir('#').path + '/filelist.json')) as fp:
filelist = json.load(fp) filelist = json.load(fp)
@@ -526,7 +527,7 @@ if (env['fat_binary']):
sve_o = build_sve_objs(lib_files_sve)
arm_compute_a = build_library('arm_compute-static', arm_compute_env, lib_files + sve_o, static=True)
else:
- arm_compute_a = build_library('arm_compute-static', arm_compute_env, lib_files + lib_files_sve, static=True)
+ arm_compute_a = build_library('arm_compute', arm_compute_env, lib_files + lib_files_sve, static=True)
Export('arm_compute_a')
# Build shared libraries
@@ -539,7 +540,7 @@ if env['os'] != 'bare_metal' and not env['standalone']
Export('arm_compute_so')
# Generate dummy core lib for backwards compatibility
-arm_compute_core_a = build_library('arm_compute_core-static', arm_compute_env, [], static=True)
+arm_compute_core_a = build_library('arm_compute_core', arm_compute_env, [], static=True)
Export('arm_compute_core_a')
if env['os'] != 'bare_metal' and not env['standalone']:
@@ -551,7 +552,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
# Build graph libraries
arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', '-Wno-pessimizing-move'])
-arm_compute_graph_a = build_library('arm_compute_graph-static', arm_compute_graph_env, graph_files, static=True, libs = [ arm_compute_a])
+arm_compute_graph_a = build_library('arm_compute_graph', arm_compute_graph_env, graph_files, static=True, libs = [ arm_compute_a])
Export('arm_compute_graph_a')
if env['os'] != 'bare_metal' and not env['standalone']:

10
devel/arm-compute-library/patches/patch-SConstruct
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-SConstruct,v 1.1.1.1 2021/10/19 03:54:58 kevlo Exp $ $OpenBSD: patch-SConstruct,v 1.2 2022/01/02 14:11:16 kevlo Exp $
Index: SConstruct Index: SConstruct
--- SConstruct.orig --- SConstruct.orig
+++ SConstruct +++ SConstruct
@@ -48,7 +48,7 @@ vars.AddVariables( @@ -94,7 +94,7 @@ vars.AddVariables(
allowed_values=("armv7a", "armv7a-hf", "arm64-v8a", "arm64-v8.2-a", "arm64-v8.2-a-sve", "arm64-v8.2-a-sve2", "x86_32", "x86_64", allowed_values=("armv7a", "armv7a-hf", "arm64-v8a", "arm64-v8.2-a", "arm64-v8.2-a-sve", "arm64-v8.2-a-sve2", "x86_32", "x86_64",
"armv8a", "armv8.2-a", "armv8.2-a-sve", "armv8.6-a", "armv8.6-a-sve", "armv8.6-a-sve2", "armv8r64", "x86")), "armv8a", "armv8.2-a", "armv8.2-a-sve", "armv8.6-a", "armv8.6-a-sve", "armv8.6-a-sve2", "armv8r64", "x86")),
EnumVariable("estate", "Execution State", "auto", allowed_values=("auto", "32", "64")), EnumVariable("estate", "Execution State", "auto", allowed_values=("auto", "32", "64")),
@ -12,7 +12,7 @@ Index: SConstruct
EnumVariable("build", "Build type", "cross_compile", allowed_values=("native", "cross_compile", "embed_only")), EnumVariable("build", "Build type", "cross_compile", allowed_values=("native", "cross_compile", "embed_only")),
BoolVariable("examples", "Build example programs", True), BoolVariable("examples", "Build example programs", True),
BoolVariable("gemm_tuner", "Build gemm_tuner programs", True), BoolVariable("gemm_tuner", "Build gemm_tuner programs", True),
@@ -167,17 +167,8 @@ c_compiler = os.environ.get('CC', default_c_compiler) @@ -214,17 +214,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 ): 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") print( "WARNING: Only clang is officially supported to build the Compute Library for Android")
@ -31,7 +31,7 @@ Index: SConstruct
if env['cppthreads']: if env['cppthreads']:
env.Append(CPPDEFINES = [('ARM_COMPUTE_CPP_SCHEDULER', 1)]) env.Append(CPPDEFINES = [('ARM_COMPUTE_CPP_SCHEDULER', 1)])
@@ -289,25 +280,6 @@ if not GetOption("help"): @@ -336,25 +327,6 @@ if not GetOption("help"):
print("ERROR: Compiler '%s' not found" % env['CXX']) print("ERROR: Compiler '%s' not found" % env['CXX'])
Exit(1) Exit(1)
@ -57,7 +57,7 @@ Index: SConstruct
if env['fat_binary']: if env['fat_binary']:
if env['arch'] != 'armv8.2-a': if env['arch'] != 'armv8.2-a':
print("Currently fat binary is only supported with armv8.2-a") print("Currently fat binary is only supported with armv8.2-a")
@@ -371,6 +343,9 @@ if env['opencl']: @@ -420,6 +392,9 @@ if env['opencl']:
if env["os"] not in ["android", "bare_metal"] and (env['opencl'] or env['cppthreads']): if env["os"] not in ["android", "bare_metal"] and (env['opencl'] or env['cppthreads']):
env.Append(LIBS = ['pthread']) env.Append(LIBS = ['pthread'])

16
devel/arm-compute-library/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2021/10/19 03:54:59 kevlo Exp $ @comment $OpenBSD: PLIST,v 1.2 2022/01/02 14:11:16 kevlo Exp $
include/CL/ include/CL/
include/CL/cl.h include/CL/cl.h
include/CL/cl2.hpp include/CL/cl2.hpp
@ -11,6 +11,7 @@ include/CL/cl_ext.h
include/CL/cl_ext_intel.h include/CL/cl_ext_intel.h
include/CL/cl_gl.h include/CL/cl_gl.h
include/CL/cl_gl_ext.h include/CL/cl_gl_ext.h
include/CL/cl_half.h
include/CL/cl_icd.h include/CL/cl_icd.h
include/CL/cl_platform.h include/CL/cl_platform.h
include/CL/cl_va_api_media_sharing_intel.h include/CL/cl_va_api_media_sharing_intel.h
@ -65,6 +66,7 @@ include/arm_compute/core/PixelValue.h
include/arm_compute/core/QuantizationInfo.h include/arm_compute/core/QuantizationInfo.h
include/arm_compute/core/Rounding.h include/arm_compute/core/Rounding.h
include/arm_compute/core/Size2D.h include/arm_compute/core/Size2D.h
include/arm_compute/core/Size3D.h
include/arm_compute/core/Steps.h include/arm_compute/core/Steps.h
include/arm_compute/core/Strides.h include/arm_compute/core/Strides.h
include/arm_compute/core/SubTensorInfo.h include/arm_compute/core/SubTensorInfo.h
@ -78,6 +80,8 @@ include/arm_compute/core/Window.h
include/arm_compute/core/Window.inl include/arm_compute/core/Window.inl
include/arm_compute/core/WindowIterator.h include/arm_compute/core/WindowIterator.h
include/arm_compute/core/experimental/ include/arm_compute/core/experimental/
include/arm_compute/core/experimental/IPostOp.h
include/arm_compute/core/experimental/PostOps.h
include/arm_compute/core/experimental/Types.h include/arm_compute/core/experimental/Types.h
include/arm_compute/core/utils/ include/arm_compute/core/utils/
include/arm_compute/core/utils/helpers/ include/arm_compute/core/utils/helpers/
@ -194,6 +198,7 @@ include/arm_compute/graph/nodes/EltwiseLayerNode.h
include/arm_compute/graph/nodes/FlattenLayerNode.h include/arm_compute/graph/nodes/FlattenLayerNode.h
include/arm_compute/graph/nodes/FullyConnectedLayerNode.h include/arm_compute/graph/nodes/FullyConnectedLayerNode.h
include/arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h include/arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h
include/arm_compute/graph/nodes/FusedConvolutionWithPostOpNode.h
include/arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h include/arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h
include/arm_compute/graph/nodes/GenerateProposalsLayerNode.h include/arm_compute/graph/nodes/GenerateProposalsLayerNode.h
include/arm_compute/graph/nodes/InputNode.h include/arm_compute/graph/nodes/InputNode.h
@ -264,6 +269,7 @@ include/arm_compute/runtime/CL/functions/CLCast.h
include/arm_compute/runtime/CL/functions/CLChannelShuffleLayer.h include/arm_compute/runtime/CL/functions/CLChannelShuffleLayer.h
include/arm_compute/runtime/CL/functions/CLComparison.h include/arm_compute/runtime/CL/functions/CLComparison.h
include/arm_compute/runtime/CL/functions/CLConcatenateLayer.h include/arm_compute/runtime/CL/functions/CLConcatenateLayer.h
include/arm_compute/runtime/CL/functions/CLConv3D.h
include/arm_compute/runtime/CL/functions/CLConvertFullyConnectedWeights.h include/arm_compute/runtime/CL/functions/CLConvertFullyConnectedWeights.h
include/arm_compute/runtime/CL/functions/CLConvolutionLayer.h include/arm_compute/runtime/CL/functions/CLConvolutionLayer.h
include/arm_compute/runtime/CL/functions/CLCopy.h include/arm_compute/runtime/CL/functions/CLCopy.h
@ -283,7 +289,6 @@ include/arm_compute/runtime/CL/functions/CLFFT1D.h
include/arm_compute/runtime/CL/functions/CLFFT2D.h include/arm_compute/runtime/CL/functions/CLFFT2D.h
include/arm_compute/runtime/CL/functions/CLFFTConvolutionLayer.h include/arm_compute/runtime/CL/functions/CLFFTConvolutionLayer.h
include/arm_compute/runtime/CL/functions/CLFill.h include/arm_compute/runtime/CL/functions/CLFill.h
include/arm_compute/runtime/CL/functions/CLFillBorder.h
include/arm_compute/runtime/CL/functions/CLFlattenLayer.h include/arm_compute/runtime/CL/functions/CLFlattenLayer.h
include/arm_compute/runtime/CL/functions/CLFloor.h include/arm_compute/runtime/CL/functions/CLFloor.h
include/arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h include/arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h
@ -395,6 +400,7 @@ include/arm_compute/runtime/NEON/functions/NEBoundingBoxTransform.h
include/arm_compute/runtime/NEON/functions/NECast.h include/arm_compute/runtime/NEON/functions/NECast.h
include/arm_compute/runtime/NEON/functions/NEChannelShuffleLayer.h include/arm_compute/runtime/NEON/functions/NEChannelShuffleLayer.h
include/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h include/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h
include/arm_compute/runtime/NEON/functions/NEConv3D.h
include/arm_compute/runtime/NEON/functions/NEConvertFullyConnectedWeights.h include/arm_compute/runtime/NEON/functions/NEConvertFullyConnectedWeights.h
include/arm_compute/runtime/NEON/functions/NEConvolutionLayer.h include/arm_compute/runtime/NEON/functions/NEConvolutionLayer.h
include/arm_compute/runtime/NEON/functions/NECopy.h include/arm_compute/runtime/NEON/functions/NECopy.h
@ -522,11 +528,11 @@ include/utils/command_line/ListOption.h
include/utils/command_line/Option.h include/utils/command_line/Option.h
include/utils/command_line/SimpleOption.h include/utils/command_line/SimpleOption.h
include/utils/command_line/ToggleOption.h include/utils/command_line/ToggleOption.h
@static-lib lib/libarm_compute-static.a @static-lib lib/libarm_compute.a
@lib lib/libarm_compute.so.${LIBarm_compute_VERSION} @lib lib/libarm_compute.so.${LIBarm_compute_VERSION}
@static-lib lib/libarm_compute_core-static.a @static-lib lib/libarm_compute_core.a
@lib lib/libarm_compute_core.so.${LIBarm_compute_core_VERSION} @lib lib/libarm_compute_core.so.${LIBarm_compute_core_VERSION}
@static-lib lib/libarm_compute_graph-static.a @static-lib lib/libarm_compute_graph.a
@lib lib/libarm_compute_graph.so.${LIBarm_compute_graph_VERSION} @lib lib/libarm_compute_graph.so.${LIBarm_compute_graph_VERSION}
share/examples/arm-compute-library/ share/examples/arm-compute-library/
share/examples/arm-compute-library/cl_cache.cpp share/examples/arm-compute-library/cl_cache.cpp