diff --git a/.github/workflows/build_wheels_and_releases.yml b/.github/workflows/build_wheels_and_releases.yml index 4e6f57a4ca..b6801e26d8 100644 --- a/.github/workflows/build_wheels_and_releases.yml +++ b/.github/workflows/build_wheels_and_releases.yml @@ -24,28 +24,28 @@ jobs: matrix: include: # Window 64 bit -# - os: windows-2019 -# python: 38 -# bitness: 64 -# platform_id: win_amd64 -# - os: windows-latest -# python: 39 -# bitness: 64 -# platform_id: win_amd64 -# - os: windows-latest -# python: 310 -# bitness: 64 -# platform_id: win_amd64 -# -# # Window 32 bit -# - os: windows-latest -# python: 38 -# bitness: 32 -# platform_id: win32 -# - os: windows-latest -# python: 39 -# bitness: 32 -# platform_id: win32 + - os: windows-2019 + python: 38 + bitness: 64 + platform_id: win_amd64 + - os: windows-latest + python: 39 + bitness: 64 + platform_id: win_amd64 + - os: windows-latest + python: 310 + bitness: 64 + platform_id: win_amd64 + + # Window 32 bit + - os: windows-latest + python: 38 + bitness: 32 + platform_id: win32 + - os: windows-latest + python: 39 + bitness: 32 + platform_id: win32 # Linux 64 bit manylinux2014 - os: ubuntu-latest @@ -53,46 +53,46 @@ jobs: bitness: 64 platform_id: manylinux_x86_64 manylinux_image: manylinux2014 -# - os: ubuntu-latest -# python: 39 -# bitness: 64 -# platform_id: manylinux_x86_64 -# manylinux_image: manylinux2014 -# -# # NumPy on Python 3.10 only supports 64bit and is only available with manylinux2014 -# - os: ubuntu-latest -# python: 310 -# bitness: 64 -# platform_id: manylinux_x86_64 -# manylinux_image: manylinux2014 + - os: ubuntu-latest + python: 39 + bitness: 64 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + + # NumPy on Python 3.10 only supports 64bit and is only available with manylinux2014 + - os: ubuntu-latest + python: 310 + bitness: 64 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 # MacOS x86_64 -# - os: macos-latest -# bitness: 64 -# python: 38 -# platform_id: macosx_x86_64 -# - os: macos-latest -# bitness: 64 -# python: 39 -# platform_id: macosx_x86_64 -# - os: macos-latest -# bitness: 64 -# python: 310 -# platform_id: macosx_x86_64 -# -# # MacOS arm64 -# - os: macos-latest -# bitness: 64 -# python: 38 -# platform_id: macosx_arm64 -# - os: macos-latest -# bitness: 64 -# python: 39 -# platform_id: macosx_arm64 -# - os: macos-latest -# bitness: 64 -# python: 310 -# platform_id: macosx_arm64 + - os: macos-latest + bitness: 64 + python: 38 + platform_id: macosx_x86_64 + - os: macos-latest + bitness: 64 + python: 39 + platform_id: macosx_x86_64 + - os: macos-latest + bitness: 64 + python: 310 + platform_id: macosx_x86_64 + + # MacOS arm64 + - os: macos-latest + bitness: 64 + python: 38 + platform_id: macosx_arm64 + - os: macos-latest + bitness: 64 + python: 39 + platform_id: macosx_arm64 + - os: macos-latest + bitness: 64 + python: 310 + platform_id: macosx_arm64 steps: - name: Checkout fedml @@ -100,8 +100,8 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 - with: - python-version: '3.9' + #with: + # python-version: '3.9' - name: Build and test wheels env: diff --git a/python/fedml/__init__.py b/python/fedml/__init__.py index 3e0929d56e..aea6c4dbff 100644 --- a/python/fedml/__init__.py +++ b/python/fedml/__init__.py @@ -23,7 +23,7 @@ _global_training_type = None _global_comm_backend = None -__version__ = "0.7.317" +__version__ = "0.7.319" def init(args=None): diff --git a/python/setup.py b/python/setup.py index cf28885c37..e2f6617d78 100755 --- a/python/setup.py +++ b/python/setup.py @@ -6,18 +6,16 @@ try: - from wheel.bdist_wheel import bdist_wheel -# from wheel.bdist_wheel import bdist_wheel as _bdist_wheel -# -# -# class bdist_wheel(_bdist_wheel): -# def finalize_options(self): -# self.root_is_pure = False -# self.universal = True -# _bdist_wheel.finalize_options(self) -# -# -# + #from wheel.bdist_wheel import bdist_wheel + from wheel.bdist_wheel import bdist_wheel as _bdist_wheel + + + class bdist_wheel(_bdist_wheel): + def finalize_options(self): + self.root_is_pure = False + self.universal = True + _bdist_wheel.finalize_options(self) + except ImportError: bdist_wheel = None @@ -74,7 +72,7 @@ setup( name="fedml", - version="0.7.317", + version="0.7.319", author="FedML Team", author_email="ch@fedml.ai", description="A research and production integrated edge-cloud library for " @@ -140,5 +138,5 @@ ] }, cmdclass={"bdist_wheel": bdist_wheel}, - options={"bdist_wheel": {"universal": True}} + #options={"bdist_wheel": {"universal": True}} )