Remove x86 linux builds from code

Author: overfl0

CMakeLists.txt

@@ -28,17 +28,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
         message(FATAL_ERROR "Require at least gcc-9.0")
     endif()
 
-    if(USE_64BIT_BUILD)
-        message(STATUS "Setting GCC flags (64bit)")
-        set(CMAKE_LIBRARY_ARCHITECTURE x86_64-linux-gnu)
-        set(CMAKE_CXX_FLAGS "-O3 -s -fPIC -pthread")
-        set(CMAKE_PREFIX_PATH "@Pythia/python-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-embed-linux64")
-    else()
-        message(STATUS "Setting GCC flags (32bit)")
-        set(CMAKE_LIBRARY_ARCHITECTURE i386-linux-gnu)
-        set(CMAKE_CXX_FLAGS "-O3 -s -fPIC -pthread -march=i686 -m32")
-        set(CMAKE_PREFIX_PATH "@Pythia/python-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-embed-linux32")
-    endif()
+    message(STATUS "Setting GCC flags (64bit)")
+    set(CMAKE_LIBRARY_ARCHITECTURE x86_64-linux-gnu)
+    set(CMAKE_CXX_FLAGS "-O3 -s -fPIC -pthread")
+    set(CMAKE_PREFIX_PATH "@Pythia/python-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-embed-linux64")
 
 else() # MSVC
     if(CMAKE_SIZEOF_VOID_P LESS 8)

CMakeSettings.json

@@ -41,45 +41,15 @@
             "variables": [
                 {
                     "name": "CMAKE_C_COMPILER",
-                    "value": "/usr/bin/gcc-9",
+                    "value": "/usr/bin/gcc",
                     "type": "FILEPATH"
                 },
                 {
                     "name": "CMAKE_CXX_COMPILER",
-                    "value": "/usr/bin/g++-9",
+                    "value": "/usr/bin/g++",
                     "type": "FILEPATH"
                 }
             ]
-        },
-        {
-            "name": "x86-WSL-GCC-Release",
-            "generator": "Ninja",
-            "configurationType": "RelWithDebInfo",
-            "buildRoot": "${projectDir}\\out\\build\\${name}",
-            "installRoot": "${projectDir}\\out\\install\\${name}",
-            "cmakeExecutable": "cmake",
-            "cmakeCommandArgs": "",
-            "buildCommandArgs": "",
-            "ctestCommandArgs": "",
-            "inheritEnvironments": [ "linux_x86" ],
-            "wslPath": "${defaultWSLPath}",
-            "variables": [
-                {
-                    "name": "CMAKE_C_COMPILER",
-                    "value": "/usr/bin/gcc-9",
-                    "type": "FILEPATH"
-                },
-                {
-                    "name": "CMAKE_CXX_COMPILER",
-                    "value": "/usr/bin/g++-9",
-                    "type": "FILEPATH"
-                },
-                {
-                    "name": "USE_64BIT_BUILD",
-                    "value": "OFF",
-                    "type": "STRING"
-                }
-            ]
         }
     ]
 }

Dockerfile.x86

@@ -279,10 +279,7 @@ Run this on Windows (requires WSL2 and Docker to be installed and configured!)
 
     powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"
 
-    # Setup WSL for both x86 and x64 architectures
-    wsl /bin/bash -ic "sudo dpkg --add-architecture i386"
-    wsl /bin/bash -ic "sudo apt update"
-    wsl /bin/bash -ic "sudo apt install python3-pip patchelf libcrypt1:i386 clang gcc-multilib"
+    # Setup uv on WSL
     wsl /bin/bash -ic "curl -LsSf https://astral.sh/uv/install.sh | sh"
 
     uv run tools\rebuild_all.py

README.md

@@ -10,11 +10,7 @@
     #define EMBEDDEDPYTHONPATH L"python-" PYTHON_VERSION "-embed-win32"
     #endif
 #else // ifdef _WIN32
-    #if defined(__amd64__) || defined(_M_X64) /* x86_64 arch */
     #define EMBEDDEDPYTHONPATH "python-" PYTHON_VERSION "-embed-linux64"
-    #else
-    #define EMBEDDEDPYTHONPATH "python-" PYTHON_VERSION "-embed-linux32"
-    #endif
 #endif
 
 std::string GetCurrentWorkingDir()

src/Pythia/Paths.cpp

@@ -83,7 +83,6 @@ def create_interpreters(version, dest):
 def _get_embed(version, system, arch):
     embed = {
         'linux': {
-            'x86': os.path.join('@Pythia', f'python-{version.major}{version.minor}-embed-linux32', 'bin', 'python3'),
             'x64': os.path.join('@Pythia', f'python-{version.major}{version.minor}-embed-linux64', 'bin', 'python3'),
         },
         'windows': {
@@ -103,19 +102,22 @@ def build_binaries(version, arch, system, run_tests=True):
         env = None
     else:
         env = setuptools.msvc.msvc14_get_vc_env(arch)
+    #     env = os.environ.copy()
+    #     msvc_env = setuptools.msvc.EnvironmentInfo(arch).return_env()
+    #     env.update(msvc_env)
+    # print(env)
 
     if os.path.exists('ninja'):
         shutil.rmtree('ninja')
     os.makedirs('ninja')
 
     if system == 'linux':
-        platform = ['--platform', 'linux/386'] if arch == 'x86' else []
-        _verbose_run(['docker', 'build', '-f', f'Dockerfile.{arch}'] + platform + ['-t', 'pythia:latest', '.'], check=True)
+        _verbose_run(['docker', 'build', '-f', f'Dockerfile.{arch}', '-t', 'pythia:latest', '.'], check=True)
         # Workaround for GitHub Actions
         # This is to fix GIT not liking owner of the checkout dir (git callback in cmake)
         # https://github.com/actions/runner/issues/2033
         uid_gid = ['-u', f'{os.getuid()}:{os.getgid()}'] if sys.platform == 'linux' else []
-        docker_prefix = ['docker', 'run'] + platform + uid_gid + ['--rm', '-v', f'{os.getcwd()}/:/data', '-w', '/data/ninja', 'pythia:latest']
+        docker_prefix = ['docker', 'run'] + uid_gid + ['--rm', '-v', f'{os.getcwd()}/:/data', '-w', '/data/ninja', 'pythia:latest']
         shell = False
     else:
         docker_prefix = []

templates/install_requirements32.sh

@@ -10,10 +10,9 @@
 
 EMBED_DIR = 'python-{version_short}-embed-{arch}'
 ARCHITECTURES_WINDOWS = ['win32', 'amd64']
-ARCHITECTURES_LINUX = ['linux32', 'linux64']
+ARCHITECTURES_LINUX = ['linux64']
 ARCHITECTURES_CURRENT = ARCHITECTURES_WINDOWS if platform.system() == 'Windows' else ARCHITECTURES_LINUX
 STANDALONE_MAPPING = {
-    'linux32': 'cpython-{version}-linux-x86-gnu',
     'linux64': 'cpython-{version}-linux-x86_64-gnu',
     'win32': 'cpython-{version}-windows-x86-none',
     'amd64': 'cpython-{version}-windows-x86_64-none',
@@ -46,12 +45,6 @@ def convert_standalone_build(directory):
 
     if platform.system() == 'Linux':
         dereference_symlinks('.')
-        # Note: both adding the rpath and copying libcrypt will be unnecessary with 3.11+
-        subprocess.run("patchelf --set-rpath '$ORIGIN/../lib' bin/python3", shell=True, check=True)
-        current_dir = os.getcwd()
-        subprocess.run('docker run --platform linux/386 --rm -v "$(pwd)"/:/data quay.io/pypa/manylinux2014_i686:latest /bin/bash -c "cp /usr/local/lib/libcrypt.so.1 /data/ && chown 1000:1000 /data/libcrypt.so.1 && chmod 555 /data/libcrypt.so.1"',
-                       shell=True, cwd='lib', check=True)
-        os.chdir(current_dir)
 
     os.chdir(currdir)
 

tools/build.py

@@ -36,11 +36,13 @@ def rebuild_all(args):
 
     platform = 'windows' if sys.platform != 'linux' else sys.platform
 
-    build_binaries(args.version, 'x86', platform)
+    if platform != 'linux':
+        build_binaries(args.version, 'x86', platform)
     build_binaries(args.version, 'x64', platform)
 
     if should_run_tests:
-        run_tests(args.version, 'x86', platform)
+        if platform != 'linux':
+            run_tests(args.version, 'x86', platform)
         run_tests(args.version, 'x64', platform)
 
     if args.wsl: