Skip to content

Commit 37336e7

Browse files
authored
do not break ncnn_version() api compatibility (#6438)
1 parent 745c38d commit 37336e7

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set(NCNN_VERSION_MAJOR 1)
1919
set(NCNN_VERSION_MINOR 0)
2020
set(NCNN_VERSION_PATCH ${NCNN_VERSION})
2121
set(NCNN_VERSION_STRING ${NCNN_VERSION_MAJOR}.${NCNN_VERSION_MINOR}.${NCNN_VERSION_PATCH})
22+
set(NCNN_VERSION_NUMBER ${NCNN_VERSION})
2223
message(STATUS "NCNN_VERSION_STRING = ${NCNN_VERSION_STRING}")
2324

2425
cmake_minimum_required(VERSION 2.8.12...3.10)

src/c_api.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ using ncnn::ParamDict;
3434
extern "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 */

src/c_api.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
extern "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 */
2222
typedef struct __ncnn_allocator_t* ncnn_allocator_t;

src/gpu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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;

src/platform.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
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

0 commit comments

Comments
 (0)