Merge remote-tracking branch 'origin/main' into refactor

Author: Christopher Doris

docs/src/juliacall.md

@@ -124,6 +124,7 @@ be configured in two ways:
 | `-X juliacall-threads=<N\|auto>` | `PYTHON_JULIACALL_THREADS=<N\|auto>` | Launch N threads. |
 | `-X juliacall-warn-overwrite=<yes\|no>` | `PYTHON_JULIACALL_WARN_OVERWRITE=<yes\|no>` | Enable or disable method overwrite warnings. |
 | `-X juliacall-autoload-ipython-extension=<yes\|no>` | `PYTHON_JULIACALL_AUTOLOAD_IPYTHON_EXTENSION=<yes\|no>` | Enable or disable IPython extension autoloading. |
+| `-X juliacall-heap-size-hint=<N>` | `PYTHON_JULIACALL_HEAP_SIZE_HINT=<N>` | Hint for initial heap size in bytes. |
 
 ## [Multi-threading](@id py-multi-threading)
 

docs/src/releasenotes.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## Unreleased
+* Added `PYTHON_JULIACALL_HEAP_SIZE_HINT` option to configure initial Julia heap size.
+* `Base.elsize` now defined for `PyArray`.
+
 ## 0.9.24 (2025-01-22)
 * Bug fixes.
 

pysrc/juliacall/__init__.py

@@ -125,9 +125,9 @@ def int_option(name, *, accept_auto=False, **kw):
                 f"{s}: expecting an int" + (" or auto" if accept_auto else "")
             )
 
-    def args_from_config():
-        argv = [CONFIG["exepath"]]
-        for opt, val in CONFIG.items():
+    def args_from_config(config):
+        argv = [config["exepath"]]
+        for opt, val in config.items():
             if opt.startswith("opt_"):
                 if val is None:
                     if opt == "opt_handle_signals":
@@ -164,6 +164,7 @@ def args_from_config():
     CONFIG["opt_warn_overwrite"] = choice("warn_overwrite", ["yes", "no"])[0]
     CONFIG["opt_handle_signals"] = choice("handle_signals", ["yes", "no"])[0]
     CONFIG["opt_startup_file"] = choice("startup_file", ["yes", "no"])[0]
+    CONFIG["opt_heap_size_hint"] = option("heap_size_hint")[0]
 
     # Stop if we already initialised
     if CONFIG["inited"]:
@@ -208,7 +209,7 @@ def args_from_config():
     CONFIG["lib"] = lib = c.PyDLL(libpath, mode=c.RTLD_GLOBAL)
 
     # parse options
-    argc, argv = args_from_config()
+    argc, argv = args_from_config(CONFIG)
     jl_parse_opts = lib.jl_parse_opts
     jl_parse_opts.argtypes = [c.c_void_p, c.c_void_p]
     jl_parse_opts.restype = None

src/Wrap/PyArray.jl

@@ -570,6 +570,8 @@ Base.IndexStyle(::Type{PyArray{T,N,M,L,R}}) where {T,N,M,L,R} =
 
 Base.unsafe_convert(::Type{Ptr{T}}, x::PyArray{T,N,M,L,T}) where {T,N,M,L} = x.ptr
 
+Base.elsize(::Type{PyArray{T,N,M,L,T}}) where {T,N,M,L} = sizeof(T)
+
 Base.strides(x::PyArray{T,N,M,L,R}) where {T,N,M,L,R} =
     if all(mod.(x.strides, sizeof(R)) .== 0)
         div.(x.strides, sizeof(R))

test/Wrap.jl

@@ -26,6 +26,13 @@
         @test strides(y) === (1,)
         @test strides(z) === (1,)
     end
+    @testset "elsize" begin
+        @test Base.elsize(y) === sizeof(Cint)
+        @test Base.elsize(z) === sizeof(Cint)
+        @test Base.elsize(PyArray{Cint,1,true,true,Cint}) === sizeof(Cint)
+        @test Base.elsize(PyArray{Cint,1,false,false,Cint}) === sizeof(Cint)
+        @test_throws Exception elsize(PyArray{Cint,1,true,false,Cchar})
+    end
     @testset "getindex" begin
         @test_throws BoundsError y[0]
         @test y[1] == 1