Skip to content
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

Jump to bottom

Pin cbindgen to v0.24.5 #277

Merged
merged 1 commit into from
May 31, 2023
Merged

Pin cbindgen to v0.24.5 #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion equistore-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ num-traits = {version = "0.2", default-features = false}
zip = {version = "0.6", default-features = false}

[build-dependencies]
cbindgen = { version = "0.24", default-features = false }
# pin cbdingen until https://github.com/mozilla/cbindgen/issues/841 is fixed
cbindgen = { version = "=0.24.5", default-features = false }

[dev-dependencies]
which = "4"
16 changes: 13 additions & 3 deletions equistore-core/include/equistore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,10 @@ typedef struct eqs_array_t {
*
* The new array should be filled with zeros.
*/
eqs_status_t (*create)(const void *array, const uintptr_t *shape, uintptr_t shape_count, struct eqs_array_t *new_array);
eqs_status_t (*create)(const void *array,
const uintptr_t *shape,
uintptr_t shape_count,
struct eqs_array_t *new_array);
/**
* Make a copy of this `array` and return the new array in `new_array`.
*
Expand All @@ -215,7 +218,12 @@ typedef struct eqs_array_t {
* `array[samples[i].output, ..., property_start:property_end]` for `i` up
* to `samples_count`. All indexes are 0-based.
*/
eqs_status_t (*move_samples_from)(void *output, const void *input, const struct eqs_sample_mapping_t *samples, uintptr_t samples_count, uintptr_t property_start, uintptr_t property_end);
eqs_status_t (*move_samples_from)(void *output,
const void *input,
const struct eqs_sample_mapping_t *samples,
uintptr_t samples_count,
uintptr_t property_start,
uintptr_t property_end);
} eqs_array_t;

/**
Expand All @@ -230,7 +238,9 @@ typedef struct eqs_array_t {
* data, and live on CPU, since equistore will use `eqs_array_t.data` to get
* the data pointer and write to it.
*/
typedef eqs_status_t (*eqs_create_array_callback_t)(const uintptr_t *shape, uintptr_t shape_count, struct eqs_array_t *array);
typedef eqs_status_t (*eqs_create_array_callback_t)(const uintptr_t *shape,
uintptr_t shape_count,
struct eqs_array_t *array);

#ifdef __cplusplus
extern "C" {
Expand Down