Skip to content

Commit

Permalink
Update package name to toast from toast-cmb. (#488)
Browse files Browse the repository at this point in the history
* Update package name to toast from toast-cmb.

* Update authors

* Add local linux test script for cibuildwheel
  • Loading branch information
tskisner authored Sep 29, 2021
1 parent b0bca96 commit 5fde796
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 16 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
name: Test Binary Wheels

# Uncomment here for testing and comment out schedule below.
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
# on:
# push:
# branches: [ master ]
# pull_request:
# branches: [ master ]

# Uncomment here for production and comment out push / PR above.
# on:
# schedule:
# - cron: '0 4 * * *'
on:
schedule:
- cron: '0 4 * * *'

jobs:
sdist:
Expand Down
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ Theodore Kisner <[email protected]>
Reijo Keskitalo <[email protected]>
Andrea Zonca <[email protected]>
Giuseppe Puglisi <[email protected]>
Nestor Demeure <[email protected]>
Kolen Cheung <[email protected]>
2 changes: 1 addition & 1 deletion docs/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Change Log
-------------------------

2.3.13 (2021-09-23)
2.3.13 (2021-09-29)
~~~~~~~~~~~~~~~~~~~~~~~~~

* Add support for generating observation matrices (PR `#374`_).
Expand Down
14 changes: 9 additions & 5 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ If you want to use TOAST at NERSC, see :ref:`nersc`.
Pip Binary Wheels
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

If you already have a newer Python3 (>= 3.6), then you can install pre-built TOAST
If you already have a newer Python3 (>= 3.7), then you can install pre-built TOAST
packages from PyPI. You should always use virtualenv or similar tools to manage your
python environments rather than pip-installing packages as root.

Expand All @@ -38,7 +38,7 @@ On Redhat / Centos we need to take extra steps to install a recent python3::
scl enable rh-python36 bash

On MacOS, you can use homebrew or macports to install a recent python3. Now verify that
your python is at least 3.6::
your python is at least 3.7::

python3 --version

Expand All @@ -55,10 +55,14 @@ install more recent wheels from PyPI::

python3 -m pip install --upgrade pip

Next, use pip to install toast and its requirements (note that the name of the package
is "toast-cmb" on PyPI)::
Next, use pip to install toast and its requirements::

pip install toast-cmb
pip install toast

.. warning::
As of version 2.3.13, the package name on PyPI is "toast" instead of "toast-cmb".
If you think you may have an old version of toast with the previous name installed,
then do "pip uninstall toast-cmb" before installing toast.

At this point you have toast installed and you can use it from serial scripts and
notebooks. If you want to enable effective parallelism with toast (useful if you
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def readme():


conf = dict()
conf["name"] = "toast-cmb"
conf["name"] = "toast"
conf["description"] = "Time Ordered Astrophysics Scalable Tools"
conf["long_description"] = readme()
conf["long_description_content_type"] = "text/markdown"
Expand Down
2 changes: 1 addition & 1 deletion src/toast/RELEASE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.13a1
2.3.13rc1
19 changes: 19 additions & 0 deletions wheels/test_local_cibuildwheel.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

# Before running this from the toast git checkout directory,
# you shoul pip install cibuildwheel

export CIBW_BUILD="cp38-manylinux_x86_64"
export CIBW_MANYLINUX_X86_64_IMAGE="manylinux2010"
export CIBW_BUILD_VERBOSITY=3
export CIBW_ENVIRONMENT_LINUX="TOAST_BUILD_BLAS_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_LAPACK_LIBRARIES='-lopenblas -fopenmp -lm -lgfortran' TOAST_BUILD_CMAKE_VERBOSE_MAKEFILE=ON"
export CIBW_BEFORE_BUILD_LINUX=./wheels/install_deps_linux.sh
export CIBW_BEFORE_TEST="pip3 install numpy && pip3 install mpi4py"
export CIBW_TEST_COMMAND="export OMP_NUM_THREADS=2; python -c 'import toast.tests; toast.tests.run()'"

# Get the current date for logging
now=$(date "+%Y-%m-%d_%H:%M:%S")

# Run it
cibuildwheel --platform linux --archs x86_64 --output-dir wheelhouse . 2>&1 | tee log_${now}

0 comments on commit 5fde796

Please sign in to comment.