Skip to content

Commit 20e27ed

Browse files
zhengzhouhengzhouheng.zheng
andauthored
Update prebuilt and internal for 22Q1 release(#349)
update driver to REL/6.4.10.2 update internal to commit-id: 33cfb75b Co-authored-by: zhouheng.zheng <zhouheng.zheng@ouotlook.com>
1 parent d0af7ae commit 20e27ed

File tree

233 files changed

+11424
-7779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+11424
-7779
lines changed

prebuilt-sdk/x86_64_linux/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
REL/6.4.9
1+
REL/6.4.10.2

prebuilt-sdk/x86_64_linux/include/VX/vx_api.h

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3347,6 +3347,36 @@ VX_API_ENTRY vx_status VX_API_CALL vxSwapTensorHandle(vx_tensor tensor, void* ne
33473347
VX_API_ENTRY vx_status VX_API_CALL vxCopyTensorPatch(vx_tensor tensor, vx_size number_of_dims, const vx_size * view_start, const vx_size * view_end,
33483348
const vx_size * user_stride, void * user_ptr, vx_enum usage, vx_enum user_memory_type);
33493349

3350+
/*! \brief Allows the application to copy a view patch from/into an tensor object .
3351+
* \param [in] tensor The reference to the tensor object that is the source or the
3352+
* destination of the copy.
3353+
* \param [in] number_of_dims Number of patch dimension. Error return if 0 or greater than number of
3354+
* tensor dimensions. If smaller than number of tensor dimensions, the lower dimensions are assumed.
3355+
* \param [in] view_start Array of patch start points in each dimension
3356+
* \param [in] view_end Array of patch end points in each dimension
3357+
* \param [in] tensorpatch_addressing Pointer to parameter of type <tt>\ref vx_tensorpatch_addressing_t</tt>.
3358+
* \param [in] user_ptr The address of the memory location where to store the requested data
3359+
* if the copy was requested in read mode, or from where to get the data to store into the tensor
3360+
* object if the copy was requested in write mode. The accessible memory must be large enough
3361+
* to contain the specified patch with the specified layout:\n
3362+
* accessible memory in bytes >= (end[last_dimension] - start[last_dimension]) * stride[last_dimension].\n
3363+
* The layout of the user memory must follow a row major order.
3364+
* \param [in] usage This declares the effect of the copy with regard to the tensor object
3365+
* using the <tt>\ref vx_accessor_e</tt> enumeration. Only <tt>\ref VX_READ_ONLY</tt> and <tt>\ref VX_WRITE_ONLY</tt> are supported:
3366+
* \arg <tt>\ref VX_READ_ONLY</tt> means that data is copied from the tensor object into the application memory
3367+
* \arg <tt>\ref VX_WRITE_ONLY</tt> means that data is copied into the tensor object from the application memory
3368+
* \param [in] user_memory_type A <tt>\ref vx_memory_type_e</tt> enumeration that specifies
3369+
* the memory type of the memory referenced by the user_addr.
3370+
* \return A <tt>\ref vx_status_e</tt> enumeration.
3371+
* \retval VX_ERROR_OPTIMIZED_AWAY This is a reference to a virtual tensor that cannot be
3372+
* accessed by the application.
3373+
* \retval VX_ERROR_INVALID_REFERENCE The tensor reference is not actually an tensor reference.
3374+
* \retval VX_ERROR_INVALID_PARAMETERS An other parameter is incorrect.
3375+
* \ingroup group_object_tensor
3376+
*/
3377+
VX_API_ENTRY vx_status VX_API_CALL vxCopyTensorPatch2(vx_tensor tensor, vx_size number_of_dims, const vx_size * view_start, const vx_size * view_end,
3378+
const vx_tensorpatch_addressing_t * addressing, vx_size size_of_addressing, void * user_ptr, vx_enum usage, vx_enum user_memory_type);
3379+
33503380
/*! \brief Allows the application to get direct access to a patch of tensor object.
33513381
* \param [in] tensor The reference to the tensor object that is the source or the
33523382
* destination for direct access.

prebuilt-sdk/x86_64_linux/include/VX/vx_kernels.h

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ enum vx_library_e {
5050
* \ingroup group_kernel
5151
*/
5252
enum vx_kernel_e {
53-
5453
/*!
5554
* \brief The Color Space conversion kernel.
5655
* \details The conversions are based on the <tt>\ref vx_df_image_e</tt> code in the images.
@@ -377,7 +376,7 @@ enum vx_kernel_e {
377376
* \see group_vision_function_min
378377
*/
379378
VX_KERNEL_MIN = VX_KERNEL_BASE(VX_ID_KHRONOS, VX_LIBRARY_KHR_BASE) + 0x3F,
380-
379+
381380
/*! \brief The weigthed average kernel.
382381
* \see group_vision_function_weighted_average
383382
*/
@@ -391,14 +390,14 @@ enum vx_kernel_e {
391390
VX_KERNEL_NN_FULLY_CONNECTED_RELU_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x2,
392391

393392
//VX_KERNEL_NN_SOFTMAX_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x3,
394-
395-
//VX_KERNEL_NN_NORMALIZATION_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x4,
393+
394+
//VX_KERNEL_NN_NORMALIZATION_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x4,
396395

397396
VX_KERNEL_NN_LRN_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x3,
398397

399-
//VX_KERNEL_NN_NORMALIZE_IMAGE_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x4,
398+
//VX_KERNEL_NN_NORMALIZE_IMAGE_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x4,
400399

401-
//VX_KERNEL_NN_POOLING_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x7,
400+
//VX_KERNEL_NN_POOLING_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x7,
402401

403402
//VX_KERNEL_NN_ACTIVATION_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x9,
404403

@@ -415,7 +414,7 @@ enum vx_kernel_e {
415414
//VX_KERNEL_NN_CONVOLUTION_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0xF,
416415

417416
VX_KERNEL_NN_CONCATINDEFINITE_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x8,
418-
417+
419418
VX_KERNEL_NN_REORG_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x9,
420419

421420
//VX_KERNEL_NN_DECONVOLUTION_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x12,
@@ -429,35 +428,35 @@ enum vx_kernel_e {
429428
VX_KERNEL_NN_CONVOLUTION_RELU_POOLING_LAYER2 = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0xD,
430429

431430
VX_KERNEL_NN_POOLING_LAYER2 = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0xE,
432-
431+
433432
VX_KERNEL_NN_TENSOR_REDUCE_SUM = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0xF,
434-
433+
435434
VX_KERNEL_NN_TENSOR_PAD = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x10,
436435

437436
VX_KERNEL_NN_LSTM_UNIT = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x11,
438437

439438
VX_KERNEL_NN_LSTM_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x12,
440439

441440
VX_KERNEL_NN_REORG2_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x13,
442-
441+
443442
VX_KERNEL_NN_TENSOR_ROUNDING = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x14,
444-
443+
445444
VX_KERNEL_NN_HASH_LUT_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x15,
446-
445+
447446
VX_KERNEL_NN_LSH_PROJECTION_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x16,
448-
447+
449448
VX_KERNEL_NN_TENSOR_RESHPE = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x17,
450-
449+
451450
VX_KERNEL_NN_LUT2_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x18,
452-
451+
453452
VX_KERNEL_NN_TENSOR_SCALE = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x19,
454-
453+
455454
VX_KERNEL_NN_RNN_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x1A,
456-
455+
457456
VX_KERNEL_NN_SOFTMAX2_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x1B,
458-
457+
459458
VX_KERNEL_NN_SVDF_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x1C,
460-
459+
461460
VX_KERNEL_NN_NORMALIZATION_LAYER2 = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x1D,
462461

463462
VX_KERNEL_NN_TENSOR_REVERSE = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x1E,
@@ -477,11 +476,11 @@ enum vx_kernel_e {
477476
VX_KERNEL_NN_PRELU = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x25,
478477

479478
VX_KERNEL_NN_GRU_UNIT_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x26,
480-
479+
481480
VX_KERNEL_NN_GRU_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x27,
482-
481+
483482
VX_KERNEL_NN_CONV_LSTM_UNIT_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x28,
484-
483+
485484
VX_KERNEL_NN_CONV_LSTM_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x29,
486485

487486
VX_KERNEL_NN_FULLY_CONNECTED_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x2A,
@@ -498,6 +497,8 @@ enum vx_kernel_e {
498497

499498
VX_KERNEL_NN_CONV_3D_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x30,
500499

500+
VX_KERNEL_NN_DECONV_3D_LAYER = VX_KERNEL_BASE(VX_ID_VIVANTE, VX_LIBRARY_KHR_BASE) + 0x31,
501+
501502
VX_KERNEL_MAX_1_2, /*!< \internal Used for VX1.2 bounds checking in the conformance test. */
502503
};
503504

prebuilt-sdk/x86_64_linux/include/VX/vx_khr_compatible.h

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#define __VX_KHR_COMPATIBLE_H__
3030
/*
3131
VX_DECONVOLUTION_WEIGHT_LAYOUT_COMPATIBLE_KHRONOS is used to distingush deconvolution weight layout
32-
[value]
33-
0: weight_layout is whnc
32+
[value]
33+
0: weight_layout is whnc
3434
1: weight_layout is whcn
3535
*/
3636
#ifndef VX_DECONVOLUTION_WEIGHT_LAYOUT_COMPATIBLE_KHRONOS
@@ -166,4 +166,34 @@ VX_CONV_3D_API_SUPPORT is used to declare that vsi openvx driver can support con
166166
#define VX_CONV_3D_API_SUPPORT 1
167167
#endif
168168

169+
/*
170+
VX_DECONV_3D_API_SUPPORT is used to declare that vsi openvx driver can support deconv3d by vxDeconv3dLayer API.
171+
[value]
172+
0: not support
173+
1: support
174+
*/
175+
#ifndef VX_DECONV_3D_API_SUPPORT
176+
#define VX_DECONV_3D_API_SUPPORT 0
177+
#endif
178+
179+
/*
180+
VX_PAD_CONST_SUPPORT is used to declare that openvx can support pad_const for tensorpad and convolution.
181+
[value]
182+
0: not support
183+
1: support
184+
*/
185+
#ifndef VX_PAD_CONST_SUPPORT
186+
#define VX_PAD_CONST_SUPPORT 1
187+
#endif
188+
189+
/*
190+
VX_TENSOR_STRIDE_X_BITS_SUPPORT is used to declare that openvx can support tensor which bits of stride in x dimension is not an integer number of bytes.
191+
[value]
192+
0: not support
193+
1: support
194+
*/
195+
#ifndef VX_TENSOR_STRIDE_X_BITS_SUPPORT
196+
#define VX_TENSOR_STRIDE_X_BITS_SUPPORT 1
197+
#endif
198+
169199
#endif /* __VX_KHR_COMPATIBLE_H__ */

0 commit comments

Comments
 (0)