Skip to content

Add ABI version handling in C code and Python code #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abergeron merged 5 commits into from
Jan 11, 2017
Merged

Add ABI version handling in C code and Python code #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85c7f79
Add GPUARRAY_ABI_VERSION constant and
notoraptor Jan 11, 2017
12123db
Add auto-generated file `src/gpuarray/abi_version.h`
notoraptor Jan 11, 2017
43be7cf
Make GPUARRAY_ABI_VERSION a number (1000*major + minor)
notoraptor Jan 11, 2017
3221625
Add auto-generated CMake SOVERSION variable
notoraptor Jan 11, 2017
961d423
Back to right current version.
notoraptor Jan 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ distribute*tar.gz
pygpu/*.c
pygpu/*.h
pygpu/version.py
src/gpuarray/abi_version.h
src/private_config.h
Makefile.conf
1 change: 1 addition & 0 deletions pygpu/gpuarray.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ cdef extern from "Python.h":

cdef extern from "gpuarray/config.h":
int GPUARRAY_API_VERSION
int GPUARRAY_ABI_VERSION

cdef extern from "gpuarray/types.h":
ctypedef struct gpuarray_type:
Expand Down
5 changes: 5 additions & 0 deletions pygpu/gpuarray.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ def api_version():
# (library version, module version)
return (GPUARRAY_API_VERSION, 0)

def abi_version():
major_version = GPUARRAY_ABI_VERSION / 1000
minor_version = GPUARRAY_ABI_VERSION % 1000
return (major_version, minor_version)

np.import_array()

# to export the numeric value
Expand Down
14 changes: 14 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,27 @@ add_library(gpuarray-static STATIC ${GPUARRAY_SRC})
target_link_libraries(gpuarray ${CMAKE_DL_LIBS})
target_link_libraries(gpuarray-static ${CMAKE_DL_LIBS})

# Generate gpuarray/abi_version.h that contains the ABI version number.
get_target_property(GPUARRAY_ABI_VERSION gpuarray VERSION)
string(REPLACE "." ";" GPUARRAY_ABI_VERSION_NUMBERS ${GPUARRAY_ABI_VERSION})
list(GET GPUARRAY_ABI_VERSION_NUMBERS 0 GPUARRAY_ABI_VERSION_MAJOR)
list(GET GPUARRAY_ABI_VERSION_NUMBERS 1 GPUARRAY_ABI_VERSION_MINOR)
math(EXPR GPUARRAY_ABI_NUMBER "1000*${GPUARRAY_ABI_VERSION_MAJOR} + ${GPUARRAY_ABI_VERSION_MINOR}")
FILE(WRITE gpuarray/abi_version.h
"\#ifndef GPUARRAY_ABI_VERSION\n\#define GPUARRAY_ABI_VERSION ${GPUARRAY_ABI_NUMBER}\n\#endif\n"
)

# set SOVERSION and ensure it is the first part of VERSION.
set_property(TARGET gpuarray PROPERTY SOVERSION ${GPUARRAY_ABI_VERSION_MAJOR})

set(headers
gpuarray/array.h
gpuarray/blas.h
gpuarray/collectives.h
gpuarray/buffer.h
gpuarray/buffer_blas.h
gpuarray/buffer_collectives.h
gpuarray/abi_version.h
gpuarray/config.h
gpuarray/elemwise.h
gpuarray/error.h
Expand Down
2 changes: 2 additions & 0 deletions src/gpuarray/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef GPUARRAY_CONFIG
#define GPUARRAY_CONFIG

/* The following included file should have been generated by CMake. */
#include <gpuarray/abi_version.h>
#define GPUARRAY_API_VERSION 0
Copy link
Member

@nouiz nouiz Jan 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would remove this line, as it should be in the included file. Otherwise, it is an error and not having it with a wrong value should help with that.

Copy link
Contributor Author

@notoraptor notoraptor Jan 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The included file contains GPUARRAY_ABI_VERSION only, not API version !


#ifdef GPUARRAY_SHARED
Expand Down