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

adapt to array changes in julia nightly #732

Merged
merged 2 commits into from
Dec 13, 2023
Merged

adapt to array changes in julia nightly #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80885a2
adapt to array changes in julia nightly
benlorenz Nov 21, 2023
cf9d710
use jl_alloc_array_2d for all julia versions
benlorenz Dec 5, 2023
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
76 changes: 39 additions & 37 deletions deps/src/caller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include <Singular/lists.h>
#include <misc/intvec.h>

using jlcxx::jlcxx_array_data;

// Internal singular interpreter variable
extern int inerror;

Expand Down Expand Up @@ -53,11 +55,10 @@ static jl_value_t * get_type_mapper()
{
jl_array_t * current_return = jl_alloc_array_1d(jl_array_any_type, 2);
JL_GC_PUSH1(&current_return);
jl_arrayset(current_return, jl_box_int64(types[i].cmd), 0);
jl_arrayset(current_return, reinterpret_cast<jl_value_t *>(jl_symbol(types[i].name)),
1);
jl_array_ptr_set(current_return, 0, jl_box_int64(types[i].cmd));
jl_array_ptr_set(current_return, 1, reinterpret_cast<jl_value_t *>(jl_symbol(types[i].name)));
JL_GC_POP();
jl_arrayset(return_array, reinterpret_cast<jl_value_t *>(current_return), i);
jl_array_ptr_set(return_array, i, reinterpret_cast<jl_value_t *>(current_return));
}
JL_GC_POP();
return reinterpret_cast<jl_value_t *>(return_array);
Expand Down Expand Up @@ -93,11 +94,12 @@ jl_value_t * intvec_to_jl_array(intvec * v)
{
int size = v->length();
jl_array_t * result = jl_alloc_array_1d(jl_int64_vector_type, size);
int64_t* arrdata = jlcxx_array_data<int64_t>(result);
JL_GC_PUSH1(&result);
int * content = v->ivGetVec();
for (int i = 0; i < size; i++)
{
jl_arrayset(result, jl_box_int64(static_cast<int64_t>(content[i])), i);
arrdata[i] = content[i];
}
JL_GC_POP();
return reinterpret_cast<jl_value_t *>(result);
Expand All @@ -108,7 +110,7 @@ jl_value_t * intmat_to_jl_array(intvec * v)
int rows = v->rows();
int cols = v->cols();
jl_array_t * result = jl_alloc_array_2d(jl_int64_matrix_type, rows, cols);
int64_t * result_ptr = reinterpret_cast<int64_t *> jl_array_data(result);
int64_t * result_ptr = jlcxx_array_data<int64_t>(result);
for (int i = 0; i < rows; i++)
{
for (int j = 0; j < cols; j++)
Expand All @@ -125,22 +127,21 @@ void * jl_array_to_intvec(jl_value_t * array_val)
int size = jl_array_len(array);
intvec * result = new intvec(size);
int * result_content = result->ivGetVec();
if (!jl_subtype(reinterpret_cast<jl_value_t *>(jl_typeof(array_val)),
reinterpret_cast<jl_value_t *>(jl_int64_vector_type)))
{
jl_error("Input is not an Int64 vector");
}
int64_t * array_data = jlcxx_array_data<int64_t>(array);
for (int i = 0; i < size; i++)
{
jl_value_t * current_entry = jl_arrayref(array, i);
if (jl_is_int32(current_entry))
int64_t current_elem = array_data[i];
int current_elem_32 = static_cast<int>(current_elem);
if (current_elem != current_elem_32)
{
result_content[i] = static_cast<int>(jl_unbox_int32(current_entry));
}
else if (jl_is_int64(current_entry))
{
int64_t current_int64 = jl_unbox_int64(current_entry);
result_content[i] = static_cast<int>(current_int64);
if (result_content[i] != current_int64)
{
jl_error("Input entry does not fit in 32 bit integer");
}
jl_error("Input entry does not fit in 32 bit integer");
}
result_content[i] = current_elem_32;
}
return reinterpret_cast<void *>(result);
}
Expand All @@ -156,7 +157,7 @@ void * jl_array_to_intmat(jl_value_t * array_val)
{
jl_error("Input is not an Int64 matrix");
}
int64_t * array_data = reinterpret_cast<int64_t *>(jl_array_data(array));
int64_t * array_data = jlcxx_array_data<int64_t>(array);
int * vec_data = result->ivGetVec();
for (int i = 0; i < cols; i++)
{
Expand All @@ -178,14 +179,15 @@ lists jl_array_to_list_helper(jl_value_t * args_val, jl_value_t * types_val)
{
jl_array_t * args = reinterpret_cast<jl_array_t *>(args_val);
jl_array_t * types = reinterpret_cast<jl_array_t *>(types_val);
const int64_t* types_arr = jlcxx_array_data<int64_t>(types);
int size = jl_array_len(args);
lists result = (lists)omAllocBin(slists_bin);
result->Init(size);

for (int i = 0; i < size; i++)
{
result->m[i].rtyp = static_cast<int>(jl_unbox_int64(jl_arrayref(types, i)));
result->m[i].data = jl_unbox_voidpointer(jl_arrayref(args, i));
result->m[i].rtyp = static_cast<int>(types_arr[i]);
result->m[i].data = jl_unbox_voidpointer(jl_array_ptr_ref(args, i));
}
return result;
}
Expand Down Expand Up @@ -225,8 +227,8 @@ static void * copy_string_to_void(std::string s)
bool translate_singular_type(jl_value_t * obj, void ** args, int * argtypes, int i)
{
jl_array_t * array = reinterpret_cast<jl_array_t *>(obj);
int cmd = static_cast<int>(jl_unbox_int64(jl_arrayref(array, 0)));
void * arg = jl_unbox_voidpointer(jl_arrayref(array, 1));
int cmd = static_cast<int>(jl_unbox_int64(jl_array_ptr_ref(array, 0)));
void * arg = jl_unbox_voidpointer(jl_array_ptr_ref(array, 1));
args[i] = arg;
argtypes[i] = cmd;
return true;
Expand All @@ -235,10 +237,10 @@ bool translate_singular_type(jl_value_t * obj, void ** args, int * argtypes, int
jl_value_t * get_julia_type_from_sleftv(leftv ret)
{
jl_array_t * result = jl_alloc_array_1d(jl_array_any_type, 3);
jl_arrayset(result, jl_false, 0);
jl_arrayset(result, jl_box_voidpointer(ret->data), 1);
jl_array_ptr_set(result, 0, jl_false);
jl_array_ptr_set(result, 1, jl_box_voidpointer(ret->data));
ret->data = 0;
jl_arrayset(result, jl_box_int64(ret->Typ()), 2);
jl_array_ptr_set(result, 2, jl_box_int64(ret->Typ()));
ret->rtyp = 0;
return reinterpret_cast<jl_value_t *>(result);
}
Expand All @@ -264,15 +266,15 @@ jl_value_t * get_ring_content(ring r)
{
jl_array_t * current = jl_alloc_array_1d(jl_array_any_type, 3);
JL_GC_PUSH1(&current);
jl_arrayset(current, jl_box_int64(IDTYP(h)), 0);
jl_arrayset(current, reinterpret_cast<jl_value_t *>(jl_symbol(IDID(h))), 1);
jl_array_ptr_set(current, 0, jl_box_int64(IDTYP(h)));
jl_array_ptr_set(current, 1, reinterpret_cast<jl_value_t *>(jl_symbol(IDID(h))));
{
sleftv x;
x.Copy((leftv)h);
jl_arrayset(current, jl_box_voidpointer(x.data), 2);
jl_array_ptr_set(current, 2, jl_box_voidpointer(x.data));
}
JL_GC_POP();
jl_arrayset(result, reinterpret_cast<jl_value_t *>(current), nr);
jl_array_ptr_set(result, nr, reinterpret_cast<jl_value_t *>(current));
h = IDNEXT(h);
nr++;
}
Expand Down Expand Up @@ -319,12 +321,12 @@ jl_value_t * call_singular_library_procedure(std::string s,
int len = ret->listLength();
jl_array_t * list = jl_alloc_array_1d(jl_array_any_type, len + 1);
JL_GC_PUSH1(&list);
jl_arrayset(list, jl_true, 0);
jl_array_ptr_set(list, 0, jl_true);
for (int i = 0; i < len; ++i)
{
leftv next = ret->next;
ret->next = 0;
jl_arrayset(list, get_julia_type_from_sleftv(ret), i + 1);
jl_array_ptr_set(list, i+1, get_julia_type_from_sleftv(ret));
if (i > 0)
omFreeBin(ret, sleftv_bin);
ret = next;
Expand Down Expand Up @@ -369,8 +371,8 @@ jl_value_t * lookup_singular_library_symbol_wo_rng(std::string pack, std::string
// err=0: no error, res is the value of the symbol
// err=1: package found but symbol not found, res is junk
// err=2: package not found, res is junk
jl_arrayset(answer, jl_box_int64(err), 0);
jl_arrayset(answer, res, 1);
jl_array_ptr_set(answer, 0, jl_box_int64(err));
jl_array_ptr_set(answer, 1, res);
JL_GC_POP();
return reinterpret_cast<jl_value_t *>(answer);
}
Expand All @@ -386,12 +388,12 @@ jl_value_t * convert_nested_list(void * l_void)
leftv current = &(l->m[i]);
if (current->Typ() == LIST_CMD)
{
jl_arrayset(result_array,
convert_nested_list(reinterpret_cast<void *>(current->data)), i);
jl_array_ptr_set(result_array, i,
convert_nested_list(reinterpret_cast<void *>(current->data)));
}
else
{
jl_arrayset(result_array, get_julia_type_from_sleftv(current), i);
jl_array_ptr_set(result_array, i, get_julia_type_from_sleftv(current));
}
}
JL_GC_POP();
Expand Down
8 changes: 4 additions & 4 deletions deps/src/singular.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,10 @@ JLCXX_MODULE define_julia_module(jlcxx::Module & Singular)

// get output
jl_array_t * result = jl_alloc_array_1d(jl_array_any_type, 4);
jl_arrayset(result, err ? jl_true : jl_false, 0);
jl_arrayset(result, jl_cstr_to_string(singular_return.c_str()), 1);
jl_arrayset(result, jl_cstr_to_string(singular_error.c_str()), 2);
jl_arrayset(result, jl_cstr_to_string(singular_warning.c_str()), 3);
jl_array_ptr_set(result, 0, err ? jl_true : jl_false);
jl_array_ptr_set(result, 1, jl_cstr_to_string(singular_return.c_str()));
jl_array_ptr_set(result, 2, jl_cstr_to_string(singular_error.c_str()));
jl_array_ptr_set(result, 3, jl_cstr_to_string(singular_warning.c_str()));

// restore old callbacks
PrintS_callback = default_print;
Expand Down