Capture a free threaded build flag.

tonybaloney · Aug 11, 2024 · a2eb2e5 · a2eb2e5
1 parent 2ede4f9
commit a2eb2e5
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 11 deletions.
diff --git a/src/CSnakes.Runtime.Tests/Properties/launchSettings.json b/src/CSnakes.Runtime.Tests/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "CSnakes.Runtime.Tests": {
+      "commandName": "Project",
+      "nativeDebugging": true
+    }
+  }
+}
diff --git a/src/CSnakes.Runtime/CPython/Init.cs b/src/CSnakes.Runtime/CPython/Init.cs
@@ -11,11 +11,13 @@ internal unsafe partial class CPythonAPI : IDisposable
 
     private static string? pythonLibraryPath = null;
     private static readonly object initLock = new();
-    private bool disposedValue;
+    private readonly bool freeThreaded = false;
+    private bool disposedValue = false;
 
-    public CPythonAPI(string pythonLibraryPath)
+    public CPythonAPI(string pythonLibraryPath, bool freeThreaded = false)
     {
         CPythonAPI.pythonLibraryPath = pythonLibraryPath;
+        this.freeThreaded = freeThreaded;
         try
         {
             NativeLibrary.SetDllImportResolver(typeof(CPythonAPI).Assembly, DllImportResolver);

diff --git a/src/CSnakes.Runtime/IServiceCollectionExtensions.cs b/src/CSnakes.Runtime/IServiceCollectionExtensions.cs
@@ -83,9 +83,9 @@ public static IPythonEnvironmentBuilder FromMacOSInstallerLocator(this IPythonEn
         return builder;
     }
 
-    public static IPythonEnvironmentBuilder FromSource(this IPythonEnvironmentBuilder builder, string folder, string version, bool debug = true)
+    public static IPythonEnvironmentBuilder FromSource(this IPythonEnvironmentBuilder builder, string folder, string version, bool debug = true, bool freeThreaded = false)
     {
-        builder.Services.AddSingleton<PythonLocator>(new SourceLocator(folder, version, debug));
+        builder.Services.AddSingleton<PythonLocator>(new SourceLocator(folder, version, debug, freeThreaded));
         return builder;
     }
 

diff --git a/src/CSnakes.Runtime/Locators/PythonLocationMetadata.cs b/src/CSnakes.Runtime/Locators/PythonLocationMetadata.cs
@@ -4,4 +4,4 @@
 /// </summary>
 /// <param name="Folder">Path on disk where Python is to be loaded from.</param>
 /// <param name="Version">Version of Python being used from the location.</param>
-public sealed record PythonLocationMetadata(string Folder, string Version, bool Debug = false);
+public sealed record PythonLocationMetadata(string Folder, string Version, bool Debug = false, bool FreeThreaded = false);
diff --git a/src/CSnakes.Runtime/Locators/SourceLocator.cs b/src/CSnakes.Runtime/Locators/SourceLocator.cs
@@ -2,15 +2,16 @@
 
 namespace CSnakes.Runtime.Locators;
 
-internal class SourceLocator(string folder, string version, bool debug = true) : PythonLocator(version: version)
+internal class SourceLocator(string folder, string version, bool debug = true, bool freeThreaded = false) : PythonLocator(version: version)
 {
     public override PythonLocationMetadata LocatePython()
     {
         var buildFolder = Path.Combine(folder, "PCbuild", "amd64");
         return new PythonLocationMetadata(
             buildFolder,
             version,
-            debug
+            debug,
+            freeThreaded
         );
     }
 

diff --git a/src/CSnakes.Runtime/Properties/launchSettings.json b/src/CSnakes.Runtime/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "CSnakes.Runtime": {
+      "commandName": "Project",
+      "nativeDebugging": true
+    }
+  }
+}
diff --git a/src/CSnakes.Runtime/PythonEnvironment.cs b/src/CSnakes.Runtime/PythonEnvironment.cs
@@ -138,11 +138,17 @@ private CPythonAPI SetupStandardLibrary(PythonLocationMetadata pythonLocationMet
         string pythonDll = string.Empty;
         string pythonPath = string.Empty;
         string pythonLocation = pythonLocationMetadata.Folder;
+        string suffix = String.Empty;
+
+        if (pythonLocationMetadata.FreeThreaded)
+        {
+            suffix += "t";
+        }
 
         // Add standard library to PYTHONPATH
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            string suffix = pythonLocationMetadata.Debug ? "_d" : string.Empty;
+            suffix += pythonLocationMetadata.Debug ? "_d" : string.Empty;
             pythonDll = Path.Combine(pythonLocation, $"python{versionPath}{suffix}.dll");
             if (pythonLocationMetadata.Debug)
             {
@@ -156,12 +162,12 @@ private CPythonAPI SetupStandardLibrary(PythonLocationMetadata pythonLocationMet
         }
         else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
         {
-            pythonDll = Path.Combine(pythonLocation, "lib", $"libpython{majorVersion}.dylib");
+            pythonDll = Path.Combine(pythonLocation, "lib", $"libpython{majorVersion}{suffix}.dylib");
             pythonPath = Path.Combine(pythonLocation, "lib", $"python{majorVersion}") + sep + Path.Combine(pythonLocation, "lib", $"python{majorVersion}", "lib-dynload");
         }
         else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
         {
-            pythonDll = Path.Combine(pythonLocation, "lib", $"libpython{majorVersion}.so");
+            pythonDll = Path.Combine(pythonLocation, "lib", $"libpython{majorVersion}{suffix}.so");
             pythonPath = Path.Combine(pythonLocation, "lib", $"python{majorVersion}") + sep + Path.Combine(pythonLocation, "lib", $"python{majorVersion}", "lib-dynload");
         }
         else
@@ -172,7 +178,7 @@ private CPythonAPI SetupStandardLibrary(PythonLocationMetadata pythonLocationMet
         Logger.LogInformation("Python DLL: {PythonDLL}", pythonDll);
         Logger.LogInformation("Python path: {PythonPath}", pythonPath);
 
-        var api = new CPythonAPI(pythonDll)
+        var api = new CPythonAPI(pythonDll, pythonLocationMetadata.FreeThreaded)
         {
             PythonPath = pythonPath
         };