Skip to content

Commit c8b7c41

Browse files
Update internal ovxlib to rel/1.2.14 (#699)
Type: New Feature Signed-off-by: Feiyue Chen <Feiyue.Chen@verisilicon.com>
1 parent 8894360 commit c8b7c41

File tree

94 files changed

+15815
-1177
lines changed

Some content is hidden

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

94 files changed

+15815
-1177
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.6
1+
1.2.14

src/tim/vx/internal/include/interface/ops.def

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,7 @@ DEF_OP(CROP_AND_RESIZE)
199199
DEF_OP(TAN)
200200
DEF_OP(RMSNORM)
201201
DEF_OP(SHAPE)
202+
DEF_OP(BITCAST)
203+
DEF_OP(GROUPED_CONV3D)
204+
DEF_OP(COL2IM)
205+
DEF_OP(L1_LAYER_NORM)
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/****************************************************************************
2+
*
3+
* Copyright (c) 2020 Vivante Corporation
4+
*
5+
* Permission is hereby granted, free of charge, to any person obtaining a
6+
* copy of this software and associated documentation files (the "Software"),
7+
* to deal in the Software without restriction, including without limitation
8+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
9+
* and/or sell copies of the Software, and to permit persons to whom the
10+
* Software is furnished to do so, subject to the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be included in
13+
* all copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21+
* DEALINGS IN THE SOFTWARE.
22+
*
23+
*****************************************************************************/
24+
25+
#ifndef _VSI_NN_OP_BITCAST_H
26+
#define _VSI_NN_OP_BITCAST_H
27+
28+
#include "vsi_nn_types.h"
29+
30+
#ifdef __cplusplus
31+
extern "C" {
32+
#endif
33+
34+
typedef struct _vsi_nn_bitcast_param
35+
{
36+
struct _bitcast_local_data_t* local;
37+
} vsi_nn_bitcast_param;
38+
39+
#ifdef __cplusplus
40+
}
41+
#endif
42+
43+
#endif
44+
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/****************************************************************************
2+
*
3+
* Copyright (c) 2020 Vivante Corporation
4+
*
5+
* Permission is hereby granted, free of charge, to any person obtaining a
6+
* copy of this software and associated documentation files (the "Software"),
7+
* to deal in the Software without restriction, including without limitation
8+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
9+
* and/or sell copies of the Software, and to permit persons to whom the
10+
* Software is furnished to do so, subject to the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be included in
13+
* all copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21+
* DEALINGS IN THE SOFTWARE.
22+
*
23+
*****************************************************************************/
24+
25+
#ifndef _VSI_NN_OP_COL2IM_H
26+
#define _VSI_NN_OP_COL2IM_H
27+
28+
#include "vsi_nn_types.h"
29+
30+
#ifdef __cplusplus
31+
extern "C" {
32+
#endif
33+
34+
typedef struct _vsi_nn_col2im_param
35+
{
36+
const int32_t* image_shape;
37+
const int32_t* block_shape;
38+
int32_t strides[3];
39+
int32_t pads[6];
40+
int32_t dilations[3];
41+
int32_t dim_num;
42+
} vsi_nn_col2im_param;
43+
44+
#ifdef __cplusplus
45+
}
46+
#endif
47+
48+
#endif
49+
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/****************************************************************************
2+
*
3+
* Copyright (c) 2020 Vivante Corporation
4+
*
5+
* Permission is hereby granted, free of charge, to any person obtaining a
6+
* copy of this software and associated documentation files (the "Software"),
7+
* to deal in the Software without restriction, including without limitation
8+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
9+
* and/or sell copies of the Software, and to permit persons to whom the
10+
* Software is furnished to do so, subject to the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be included in
13+
* all copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21+
* DEALINGS IN THE SOFTWARE.
22+
*
23+
*****************************************************************************/
24+
25+
#ifndef _VSI_NN_OP_GROUPED_CONV3D_H
26+
#define _VSI_NN_OP_GROUPED_CONV3D_H
27+
28+
#include "vsi_nn_types.h"
29+
30+
#ifdef __cplusplus
31+
extern "C" {
32+
#endif
33+
34+
typedef struct _vsi_nn_grouped_conv3d_param
35+
{
36+
void* local;
37+
uint32_t ksize[3];
38+
uint32_t stride[3];
39+
/* Pad left, right, top, bottom, front, rear */
40+
uint32_t pad[6];
41+
/* Pad type default value shall be AUTO */
42+
vsi_nn_pad_e pad_type;
43+
uint32_t weights;
44+
uint32_t group;
45+
uint32_t dilation[3];
46+
int32_t multiplier;
47+
vsi_nn_pad_mode_e pad_mode;
48+
} vsi_nn_grouped_conv3d_param;
49+
50+
#ifdef __cplusplus
51+
}
52+
#endif
53+
54+
#endif
55+
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/****************************************************************************
2+
*
3+
* Copyright (c) 2020 Vivante Corporation
4+
*
5+
* Permission is hereby granted, free of charge, to any person obtaining a
6+
* copy of this software and associated documentation files (the "Software"),
7+
* to deal in the Software without restriction, including without limitation
8+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
9+
* and/or sell copies of the Software, and to permit persons to whom the
10+
* Software is furnished to do so, subject to the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be included in
13+
* all copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21+
* DEALINGS IN THE SOFTWARE.
22+
*
23+
*****************************************************************************/
24+
25+
#ifndef _VSI_NN_OP_L1_LAYER_NORM_H
26+
#define _VSI_NN_OP_L1_LAYER_NORM_H
27+
28+
#include "vsi_nn_types.h"
29+
30+
#ifdef __cplusplus
31+
extern "C" {
32+
#endif
33+
34+
typedef struct _vsi_nn_l1_layer_norm_param
35+
{
36+
struct _l1_layer_norm_local_data_t * local;
37+
float eps;
38+
int32_t axis;
39+
} vsi_nn_l1_layer_norm_param;
40+
41+
42+
#ifdef __cplusplus
43+
}
44+
#endif
45+
46+
#endif
47+

src/tim/vx/internal/include/utils/vsi_nn_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ vsi_bool vsi_nn_IsEVISFeatureAvaiable
349349
vsi_nn_context_t context
350350
);
351351

352-
int32_t vsi_nn_compareVersion
352+
OVXLIB_API int32_t vsi_nn_compareVersion
353353
(
354354
vsi_nn_graph_t * graph,
355355
uint32_t version_major,

0 commit comments

Comments
 (0)