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.

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

Jump to bottom

Switch to continuumio/anaconda3 for aarch64 support #144

Merged
merged 3 commits into from
Mar 3, 2023
Merged

Switch to continuumio/anaconda3 for aarch64 support #144

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dedb817
Switch to continuumio/anaconda3 for aarch64 support
sjanzou Feb 27, 2023
93bd49b
Update per comments on #144
sjanzou Feb 28, 2023
e2ffdc6
Address #144 review
sjanzou Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions build_conda_arm64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cd $PYSAMDIR || exit
source $(conda info --base)/etc/profile.d/conda.sh

# get `CONDA_TOKEN` env variable, required for authentication
source ~/.env || exit
#source ~/.env || exit
dguittet marked this conversation as resolved.
Show resolved Hide resolved

DIST_NAME=''
if [ `uname` = "Linux" ] ;
Expand All @@ -29,9 +29,11 @@ yes | conda install conda-build
yes | conda activate base
conda update -n base -c defaults conda

for PYTHONVER in 3.8 3.9 3.10
for PYTHONVER in 3.8 3.9 3.10 3.11
do
export PYTHONVER
conda update -n base -c defaults conda
python -m pip install --upgrade pip
conda-build conda --output-folder=$DIST_DIR --python=$PYTHONVER --prefix-length=0 || exit
conda build purge
done
Expand Down
2 changes: 1 addition & 1 deletion build_manylinux_arm64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cmake ${SAMNTDIR}/api -DCMAKE_BUILD_TYPE=Release -DSAMAPI_EXPORT=1 -DSAM_SKIP_AU
make -j6

cd $PYSAMDIR
for PYTHONENV in cp38-cp38 cp39-cp39 cp310-cp310
for PYTHONENV in cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311
do
yes | /opt/python/$PYTHONENV/bin/pip install -r tests/requirements.txt
yes | /opt/python/$PYTHONENV/bin/pip uninstall NREL-PySAM
Expand Down
8 changes: 4 additions & 4 deletions build_unix_arm64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ source $(conda info --base)/etc/profile.d/conda.sh
rm -rf build
rm -rf dist/*

for PYTHONENV in pysam_build_3.8 pysam_build_3.9 pysam_build_3.10
for PYTHONENV in pysam_build_3.8 pysam_build_3.9 pysam_build_3.10 pysam_build_3.11
do
conda activate $PYTHONENV
yes | pip install -r tests/requirements.txt
Expand Down Expand Up @@ -51,11 +51,11 @@ docker run --rm -v $(pwd):/io quay.io/pypa/manylinux2014_aarch64 /io/pysam/build

rename -s linux manylinux1 $PYSAMDIR/dist/*-linux_*

docker pull continuumio/anaconda
docker run --rm --env PYSAMDIR=/io/pysam -v $(pwd):/io continuumio/anaconda /io/pysam/build_conda_arm64.sh
docker pull continuumio/anaconda3
docker run --rm --env PYSAMDIR=/io/pysam -v $(pwd):/io continuumio/anaconda3 /io/pysam/build_conda_arm64.sh


twine upload $PYSAMDIR/dist/*.whl
anaconda upload -u nrel $PYSAMDIR/dist/osx-arm64/*.tar.bz2
#anaconda upload -u nrel $PYSAMDIR/dist/linux-64/*.tar.bz2
anaconda upload -u nrel $PYSAMDIR/dist/linux-aarch64/*.tar.bz2