load python symbols globally when embedded rather than using lib_ptr (which is now NULL in this case)

Author: Christopher Rowley

pysrc/juliacall/__init__.py

@@ -269,8 +269,8 @@ def jlstr(x):
         return 'raw"' + x + '"'
     script = '''
     try
-        Base.require(Main, :CompilerSupportLibraries_jll)
-        global __PythonCall_libptr = Ptr{{Cvoid}}(UInt({}))
+        import CompilerSupportLibraries_jll as _
+        global __PythonCall_embedded__ = nothing
         ENV["JULIA_PYTHONCALL_EXE"] = {}
         using PythonCall
     catch err
@@ -280,7 +280,6 @@ def jlstr(x):
         rethrow()
     end
     '''.format(
-        hex(c.pythonapi._handle),
         jlstr(sys.executable or ''),
     )
     res = jl_eval(script.encode('utf8'))

src/C/context.jl

@@ -105,12 +105,12 @@ on_main_thread
 
 function init_context()
 
-    CTX.is_embedded = hasproperty(Base.Main, :__PythonCall_libptr)
+    CTX.is_embedded = hasproperty(Base.Main, :__PythonCall_embedded__)
 
     if CTX.is_embedded
         # In this case, getting a handle to libpython is easy
-        CTX.lib_ptr = Base.Main.__PythonCall_libptr::Ptr{Cvoid}
-        init_pointers()
+        CTX.lib_ptr = C_NULL
+        init_pointers(true)
         # Check Python is initialized
         Py_IsInitialized() == 0 && error("Python is not already initialized.")
         CTX.is_initialized = true
@@ -236,7 +236,7 @@ function init_context()
         end
 
         # Get function pointers from the library
-        init_pointers()
+        init_pointers(false)
 
         # Initialize the interpreter
         CTX.is_preinitialized = Py_IsInitialized() != 0

src/C/pointers.jl

@@ -282,19 +282,30 @@ end
 
 const POINTERS = CAPIPointers()
 
-@eval init_pointers(p::CAPIPointers = POINTERS, lib::Ptr = CTX.lib_ptr) = begin
+function _dlsym(lib::Ptr{Cvoid}, sym::Symbol)
+    if lib == C_NULL
+        # embedded case, python symbols available globally
+        cglobal(sym)::Ptr{Cvoid}
+    else
+        dlsym(lib, sym)::Ptr{Cvoid}
+    end
+end
+
+@eval function init_pointers(embedded::Bool, p::CAPIPointers = POINTERS, lib::Ptr = CTX.lib_ptr)
+    @assert (lib == C_NULL) == embedded
     $([
-        :(p.$name = dlsym(lib, $(QuoteNode(name))))
+        :(p.$name = _dlsym(lib, $(QuoteNode(name))))
         for name in CAPI_FUNCS
     ]...)
     $(
         [
             :(p.$name =
-                    Base.unsafe_load(Ptr{PyPtr}(dlsym(lib, $(QuoteNode(name)))::Ptr))) for name in CAPI_EXCEPTIONS
+                    Base.unsafe_load(Ptr{PyPtr}(_dlsym(lib, $(QuoteNode(name)))::Ptr))) for name in CAPI_EXCEPTIONS
         ]...
     )
-    $([:(p.$name = dlsym(lib, $(QuoteNode(name)))) for name in CAPI_OBJECTS]...)
-    p.PyOS_InputHookPtr = dlsym(CTX.lib_ptr, :PyOS_InputHook)
+    $([:(p.$name = _dlsym(lib, $(QuoteNode(name)))) for name in CAPI_OBJECTS]...)
+    p.PyOS_InputHookPtr = _dlsym(CTX.lib_ptr, :PyOS_InputHook)
+    nothing
 end
 
 for (name, (argtypes, rettype)) in CAPI_FUNC_SIGS