Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

debug wheels. #571

Merged
merged 1 commit into from
Sep 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 62 additions & 62 deletions .github/workflows/build_wheels_and_releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,84 +24,84 @@ 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
python: 38
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
uses: actions/checkout@v3

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
#with:
# python-version: '3.9'

- name: Build and test wheels
env:
Expand Down
2 changes: 1 addition & 1 deletion python/fedml/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
_global_training_type = None
_global_comm_backend = None

__version__ = "0.7.317"
__version__ = "0.7.319"


def init(args=None):
Expand Down
26 changes: 12 additions & 14 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 "
Expand Down Expand Up @@ -140,5 +138,5 @@
]
},
cmdclass={"bdist_wheel": bdist_wheel},
options={"bdist_wheel": {"universal": True}}
#options={"bdist_wheel": {"universal": True}}
)