File tree Expand file tree Collapse file tree 5 files changed +8
-7
lines changed
Expand file tree Collapse file tree 5 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ set(NCNN_VERSION_MAJOR 1)
1919set (NCNN_VERSION_MINOR 0)
2020set (NCNN_VERSION_PATCH ${NCNN_VERSION} )
2121set (NCNN_VERSION_STRING ${NCNN_VERSION_MAJOR} .${NCNN_VERSION_MINOR} .${NCNN_VERSION_PATCH} )
22+ set (NCNN_VERSION_NUMBER ${NCNN_VERSION} )
2223message (STATUS "NCNN_VERSION_STRING = ${NCNN_VERSION_STRING} " )
2324
2425cmake_minimum_required (VERSION 2.8.12...3.10)
Original file line number Diff line number Diff line change @@ -34,14 +34,14 @@ using ncnn::ParamDict;
3434extern " C" {
3535#endif
3636
37- const char * ncnn_version_string ()
37+ const char * ncnn_version ()
3838{
3939 return NCNN_VERSION_STRING;
4040}
4141
42- int ncnn_version ()
42+ int ncnn_version_number ()
4343{
44- return NCNN_VERSION ;
44+ return NCNN_VERSION_NUMBER ;
4545}
4646
4747/* allocator api */
Original file line number Diff line number Diff line change 1515extern "C" {
1616#endif
1717
18- NCNN_EXPORT const char * ncnn_version_string (void );
19- NCNN_EXPORT int ncnn_version (void );
18+ NCNN_EXPORT const char * ncnn_version (void );
19+ NCNN_EXPORT int ncnn_version_number (void );
2020
2121/* allocator api */
2222typedef struct __ncnn_allocator_t * ncnn_allocator_t ;
Original file line number Diff line number Diff line change @@ -2535,7 +2535,7 @@ int create_gpu_instance(const char* driver_path)
25352535 applicationInfo.pApplicationName = " ncnn" ;
25362536 applicationInfo.applicationVersion = 0 ;
25372537 applicationInfo.pEngineName = " ncnn" ;
2538- applicationInfo.engineVersion = NCNN_VERSION ;
2538+ applicationInfo.engineVersion = NCNN_VERSION_NUMBER ;
25392539 applicationInfo.apiVersion = instance_api_version;
25402540
25412541 void * enabledExtensionFeatures = 0 ;
Original file line number Diff line number Diff line change 6060#cmakedefine01 NCNN_FORCE_INLINE
6161
6262#cmakedefine NCNN_VERSION_STRING "@NCNN_VERSION_STRING@"
63- #cmakedefine NCNN_VERSION @NCNN_VERSION @
63+ #cmakedefine NCNN_VERSION_NUMBER @NCNN_VERSION_NUMBER @
6464
6565#include "ncnn_export.h"
6666
You can’t perform that action at this time.
0 commit comments