Skip to content

Wheel changes to master #654

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Mar 25, 2021
Merged

Wheel changes to master #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7746682
Merge pull request #586 from IntelPython/gold/2021-update-0-5-1
Alexander-Makaryev Feb 10, 2021
38b48b5
Fix bandit issues part 1 (#608) (#613)
densmirn Feb 19, 2021
35e65b3
Support MLK 2021.2.0 (#625)
densmirn Feb 26, 2021
1d07bc9
Update package wheel (#555)
Vyacheslav-Smirnov Mar 19, 2021
cb3ae66
Merge branch 'master' into wheel_changes_master
Vyacheslav-Smirnov Mar 19, 2021
4f4f9fd
Update development status
Vyacheslav-Smirnov Mar 22, 2021
f60cec5
Merge branch 'wheel_changes_master' of https://github.com/IntelPython…
Vyacheslav-Smirnov Mar 22, 2021
d91d85d
Merge branch 'master' into wheel_changes_master
shssf Mar 25, 2021
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
19 changes: 19 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,25 @@ cd dpnp
./0.build.sh
```

## Install Wheel Package from Pypi
Install DPNP
```cmd
python -m pip install --index-url https://pypi.anaconda.org/intel/simple -extra-index-url https://pypi.org/simple dpnp
```
Note: DPNP wheel package is placed on Pypi, but some of its dependencies (like Intel numpy) are in Anaconda Cloud.
That is why install command requires additional intel Pypi channel from Anaconda Cloud.

Set path to Performance Libraries in case of using venv or system Python:
```cmd
export LD_LIBRARY_PATH=<path_to_your_env>/lib
```

It is also required to set following environment variables:
```cmd
export OCL_ICD_FILENAMES_RESET=1
export OCL_ICD_FILENAMES=libintelocl.so
```

## Run test
```bash
. ./0.env.sh
Expand Down
4 changes: 4 additions & 0 deletions conda-recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ if [ -n "${TBBROOT}" ]; then
. ${TBBROOT}/env/vars.sh
fi

# Set RPATH for wheels
export CFLAGS="-Wl,-rpath,\$ORIGIN/../dpctl,-rpath,\$ORIGIN $CFLAGS"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How it will work in Windows?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "build.sh" file is used only for unix build. For windows there should be bld.bat with build commands.
As there is no bld.bat file, windows build now is just fake)

export LDFLAGS="-Wl,-rpath,\$ORIGIN/../dpctl,-rpath,\$ORIGIN $LDFLAGS"

$PYTHON setup.py build_clib
$PYTHON setup.py build_ext install

Expand Down
9 changes: 3 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,8 @@
with open('README.md') as f:
__readme_file__ = f.read()

with open('LICENSE.txt') as f:
__license_file__ = f.read()

CLASSIFIERS = """\
Development Status :: 0 - Alpha
Development Status :: 4 - Beta
Intended Audience :: Science/Research
Intended Audience :: Developers
License :: OSI Approved
Expand Down Expand Up @@ -183,13 +180,13 @@
version=__version__,
description="NumPy-like API accelerated with SYCL",
long_description=__readme_file__,
long_description_content_type="text/markdown",
author="Intel Corporation",
author_email="Intel Corporation",
maintainer="Intel Corp.",
maintainer_email="scripting@intel.com",
url="https://intelpython.github.io/dpnp/",
download_url="https://github.com/IntelPython/dpnp",
license=__license_file__,
license='BSD',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change related to "wheel testing"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, changing setup.py format is required to build a good wheel which can be uploaded to Pypi

classifiers=[_f for _f in CLASSIFIERS.split('\n') if _f],
keywords="sycl numpy python3 intel mkl oneapi gpu dpcpp pstl",
platforms=["Linux", "Windows"],
Expand Down