Reuse <version_config.h> instead of separate version constants in c_api.h#1003
Conversation
This commit fixes an error in how version strings are replaced in the C API header. Bumping the version to 25.08 causes the minor version to be written as "08" instead of "8", producing an invalid octal number. This commit fixes the error in the script, and also bumps the versions in the C API, documentation, and workflow yamls.
|
That the |
|
I think the |
|
(I'll fix the copyright dates shortly.) |
Not directly. It seems to update the
I've gotten an idea of how @KyleFromNVIDIA would prefer this were fixed. I'll try incorporate that change ASAP. |
|
It took me a little while to realize that what I'm trying to build here might be available already: Line 40 in a0804de |
|
I have verified that #define CUVS_VERSION_MAJOR 25
#define CUVS_VERSION_MINOR 8
#define CUVS_VERSION_PATCH 0This file lands up also being CMake-installed into the final install directory. But I can't seem to find a way to include the header in I'll seek @KyleFromNVIDIA's guidance on how this needs to be included, for the first build. |
I've modified the |
|
/ok to test b973420 |
|
@KyleFromNVIDIA, please let me know if this looks acceptable. |
KyleFromNVIDIA
left a comment
There was a problem hiding this comment.
One quick change plus one small note and then I think we're good.
KyleFromNVIDIA
left a comment
There was a problem hiding this comment.
Actually left a few more comments, let me know what you think.
And remove a stray C++-style comment. Addresses rapidsai/cuvs#1003 (comment) Authors: - Kyle Edwards (https://github.com/KyleFromNVIDIA) Approvers: - Robert Maynard (https://github.com/robertmaynard) URL: #867
1. Removed include-dir settings from tests/CMakeLists. 2. Removed version header from c-api source and tests. 3. Added version header to c-api header. 4. Modified `jextract` script for the include directory, so as to find the version header.
|
/ok to test ed14bb7 |
|
/ok to test 0a98174 |
1 similar comment
|
/ok to test 0a98174 |
|
/ok to test af53e0e |
|
/ok to test bda2c67 |
|
@KyleFromNVIDIA: After including the (This wasn't happening before, because the version header was included only in I fixed this in my local builds by including By my reading, even if we were to use the right one for CI, it would still cause At this point, I'm inclined to change things back so that:
Please let me know if that is agreeable. |
|
/ok to test 663013a |
|
@jameslamb, @rhdong: I was wondering if either of you might be able to help here. The problem is as follows:
May I please know in which directory the C++ build artifacts go? Also, what might be the best way to communicate that to the Java build? (@KyleFromNVIDIA: This is a last-ditch attempt. If there isn't an easy/good way to resolve this, I'd very much like to include the version-header in the |
That's fine with me, if you can't figure out another solution then go ahead and do it. |
1. Removed version_config.h from c_api.h. 2. Restored inclusion of version_config.h to c_api.c and c_api.cpp. 3. Reverted modification to include paths for jextract.
|
/ok to test fc631e1 |
<version_config.h> instead of separate version constants in c_api.h
|
/merge |
This commit started off trying to fix an error in how version strings are replaced in the C API header. (Bumping the version to 25.08 causes the minor version to be written as "08" instead of "8", producing an invalid octal number.)
The octal problem was already solved as part of RAPIDS CMake, which is used in cuVS to generate a
version_configi.hwith the corrected version values. This commit removes the old version constants, and switches to using what's provided by infrastructure.