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

Merge py-pandas, py-awscrt, texinfo, and ectrans bug fixes from release/1.5.1 (with mods from spack develop) #831

Merged
merged 9 commits into from
Oct 18, 2023
Merged

Merge py-pandas, py-awscrt, texinfo, and ectrans bug fixes from release/1.5.1 (with mods from spack develop) #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e2a0814
Comment out intel-oneapi-mkl in configs/containers/docker-ubuntu-inte…
climbfuji Oct 11, 2023
5f290b5
Fix incorrect variant name for mkl for package ectrans in configs/com…
climbfuji Oct 11, 2023
1e9ebda
Fix outdated instructions for Derecho in doc/source/PreConfiguredSite…
climbfuji Oct 11, 2023
119e8b6
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Oct 16, 2023
85b18a7
Add +excel variant for py-pandas in configs/common/packages.yaml
climbfuji Oct 16, 2023
c1e7821
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Oct 16, 2023
afd8a2a
Update submodule pointer for spack
climbfuji Oct 18, 2023
2f879ab
Revert .gitmodules and update submodule pointer for spack
climbfuji Oct 18, 2023
0dc94b4
Last-minute revertsal of Derecho doc updates, because they are invalid!
climbfuji Oct 18, 2023
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
6 changes: 3 additions & 3 deletions configs/common/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
variants: +fckit +ectrans +tesselation +fftw
ectrans:
version: ['1.2.0']
variants: ~enable_mkl +fftw
variants: ~mkl +fftw
eigen:
version: ['3.4.0']
# Attention - when updating the version also check the common modules.yaml
Expand Down Expand Up @@ -236,8 +236,8 @@
py-numpy:
version: ['1.22.3']
variants: +blas +lapack
py-openpyxl:
version: ['3.0.3']
py-pandas:
variants: +excel
# To avoid pip._vendor.pep517.wrappers.BackendInvalid errors with newer
# versions of py-poetry-core when using external/homebrew Python as
# we do at the moment in spack-stack.
Expand Down
11 changes: 6 additions & 5 deletions configs/containers/docker-ubuntu-intel-impi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ spack:
externals:
- spec: [email protected]
prefix: /opt/intel/oneapi
intel-oneapi-mkl:
buildable: false
externals:
- spec: [email protected]
prefix: /opt/intel/oneapi
# Comment out for now so that fftw-api uses fftw and not mkl
#intel-oneapi-mkl:
# buildable: false
# externals:
# - spec: [email protected]
# prefix: /opt/intel/oneapi
gmake:
buildable: false
externals:
Expand Down
2 changes: 1 addition & 1 deletion configs/containers/specs/jedi-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### spack-stack-1.5.0 / skylab-6.0.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
specs: [[email protected], [email protected] ~fftw, [email protected], [email protected],
specs: [[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected], ecflow@5,
[email protected], [email protected] +fckit +ectrans +tesselation +fftw, [email protected], [email protected] +fftw,
[email protected], [email protected], fms@release-jcsda, [email protected], [email protected], [email protected],
Expand Down
4 changes: 2 additions & 2 deletions doc/source/PreConfiguredSites.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,9 @@ The following is required for building new spack environments and for using spac
.. code-block:: console

module purge
# ignore that the sticky module ncarenv/... is not unloaded
ignore that the sticky module ncarenv/... is not unloaded
export LMOD_TMOD_FIND_FIRST=yes
# Temporary, until CISL created the module tree for the newest Intel compilers
Temporary, until CISL created the module tree for the newest Intel compilers
module use /lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra
module use /lustre/desc1/scratch/epicufsrt/contrib/modulefiles
module load ecflow/5.8.4
Expand Down
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 11 files
+3 −1 var/spack/repos/builtin/packages/ectrans/package.py
+3 −0 var/spack/repos/builtin/packages/fms/package.py
+1 −1 var/spack/repos/builtin/packages/py-awscrt/package.py
+18 −0 var/spack/repos/builtin/packages/py-odfpy/package.py
+1 −0 var/spack/repos/builtin/packages/py-openpyxl/package.py
+22 −0 var/spack/repos/builtin/packages/py-pandas/package.py
+19 −0 var/spack/repos/builtin/packages/py-pyxlsb/package.py
+4 −0 var/spack/repos/builtin/packages/py-xlsxwriter/package.py
+7 −6 var/spack/repos/builtin/packages/texinfo/package.py
+1 −1 var/spack/repos/jcsda-emc-bundles/packages/jedi-tools-env/package.py
+1 −1 var/spack/repos/jcsda-emc-bundles/packages/ufs-weather-model-env/package.py