Merge branch 'main' into ianna/3179-cuda-target-in-numbavectorize-not…

…-working-correctly

.all-contributorsrc

@@ -483,6 +483,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "tacaswell",
+      "name": "Thomas A Caswell",
+      "avatar_url": "https://avatars.githubusercontent.com/u/199813?v=4",
+      "profile": "https://tacaswell.github.io",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "basnijholt",
+      "name": "Bas Nijholt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6897215?v=4",
+      "profile": "http://www.nijho.lt",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "nj-vs-vh",
+      "name": "Igor Vaiman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30616208?v=4",
+      "profile": "https://nj-vs-vh.name/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/build-wheels.yml

@@ -87,7 +87,7 @@ jobs:
 
         - os: windows-latest
           arch: auto32
-          build: "cp{38,39}-"
+          build: "cp"
 
     steps:
     - uses: actions/checkout@v4
@@ -100,12 +100,12 @@ jobs:
         python-version: '3.12'
 
     - name: Setup uv
-      uses: yezz123/setup-uv@v4
+      uses: astral-sh/setup-uv@v3
 
     - name: Prepare build files
       run: pipx run nox -s prepare
 
-    - uses: pypa/cibuildwheel@v2.20
+    - uses: pypa/cibuildwheel@v2.21
       env:
         CIBW_BUILD: "${{ matrix.build }}*"
         CIBW_ARCHS: ${{ matrix.arch }}
@@ -114,13 +114,7 @@ jobs:
         package-dir: awkward-cpp
 
     - name: Check metadata
-      shell: python
-      run: |
-        import subprocess, glob
-        subprocess.run(
-          ["pipx", "run", "twine", "check", *glob.glob("wheelhouse/*.whl")],
-          check=True
-        )
+      run: pipx run twine check wheelhouse/*.whl
 
     - name: Upload wheels
       uses: actions/upload-artifact@v4
@@ -150,14 +144,14 @@ jobs:
         python-version: '3.12'
 
     - name: Setup uv
-      uses: yezz123/setup-uv@v4
+      uses: astral-sh/setup-uv@v3
 
     - name: Prepare build files
       run: pipx run nox -s prepare
 
     - uses: docker/setup-qemu-action@v3.2.0
 
-    - uses: pypa/cibuildwheel@v2.20
+    - uses: pypa/cibuildwheel@v2.21
       env:
         CIBW_BUILD: cp${{ matrix.python }}-*
         CIBW_ARCHS: ${{ matrix.arch }}
@@ -166,13 +160,7 @@ jobs:
         package-dir: awkward-cpp
 
     - name: Check metadata
-      shell: python
-      run: |
-        import subprocess, glob
-        subprocess.run(
-          ["pipx", "run", "twine", "check", *glob.glob("wheelhouse/*.whl")],
-          check=True
-        )
+      run: pipx run twine check wheelhouse/*.whl
 
     - name: Upload wheels
       uses: actions/upload-artifact@v4
@@ -192,7 +180,7 @@ jobs:
         submodules: true
 
     - name: Setup uv
-      uses: yezz123/setup-uv@v4
+      uses: astral-sh/setup-uv@v3
 
     - name: Prepare build files
       run: pipx run nox -s prepare

.github/workflows/deploy-cpp.yml

@@ -39,4 +39,4 @@ jobs:
       with:
         subject-path: "dist/awkward*cpp-*"
 
-    - uses: pypa/gh-action-pypi-publish@v1.10.1
+    - uses: pypa/gh-action-pypi-publish@v1.11.0

.github/workflows/deploy.yml

@@ -135,7 +135,7 @@ jobs:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: gh attestation verify dist/awkward-*.whl --repo ${{ github.repository }}
 
-    - uses: pypa/gh-action-pypi-publish@v1.10.1
+    - uses: pypa/gh-action-pypi-publish@v1.11.0
 
   publish-headers:
     name: "Publish header-only libraries alongside release"

.github/workflows/docs.yml

@@ -141,7 +141,7 @@ jobs:
       # solve with different external library versions. By default,
       # ROOT uses cxx-compiler too, so hopefully this won't be an issue
     - name: Setup Python via Conda
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         # Cache invalidates daily by default
         cache-environment: true
@@ -264,7 +264,7 @@ jobs:
       # solve with different external library versions. By default,
       # ROOT uses cxx-compiler too, so hopefully this won't be an issue
     - name: Setup Python via Conda
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         # Cache invalidates daily by default
         cache-environment: true

.github/workflows/packaging-test.yml

@@ -63,20 +63,20 @@ jobs:
         submodules: true
 
     - name: Setup uv
-      uses: yezz123/setup-uv@v4
+      uses: astral-sh/setup-uv@v3
 
     - name: Prepare build files
       run: pipx run nox -s prepare
 
-    - uses: pypa/cibuildwheel@v2.20
+    - uses: pypa/cibuildwheel@v2.21
       env:
         CIBW_ARCHS_MACOS: universal2
         CIBW_BUILD: cp39-win_amd64 cp310-manylinux_x86_64 cp38-macosx_universal2
       with:
         config-file: cibuildwheel.toml
         package-dir: awkward-cpp
 
-    - uses: pypa/cibuildwheel@v2.20
+    - uses: pypa/cibuildwheel@v2.21
       if: matrix.os == 'ubuntu-latest'
       env:
         CIBW_BUILD: cp312-manylinux_x86_64

.github/workflows/test.yml

@@ -175,7 +175,7 @@ jobs:
           submodules: true
 
       - name: Setup Python via Conda
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2
         with:
           # Cache invalidates daily by default
           cache-environment: true

.github/workflows/upload-nightly-wheels.yml

@@ -58,7 +58,7 @@ jobs:
           ls -l dist/
 
       - name: Upload wheels to Anaconda Cloud as nightlies
-        uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0
+        uses: scientific-python/upload-nightly-action@82396a2ed4269ba06c6b2988bb4fd568ef3c3d6b # 0.6.1
         with:
           artifacts_path: dist
           anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}

.gitignore

@@ -1,4 +1,5 @@
 studies/**/sample-*
+studies/named_axis.*
 docs/demos/countries.geojson
 docs/demos/test-program
 docs/demos/test-program.cpp
@@ -161,3 +162,6 @@ Testing/
 # Pip stuff
 /pip-wheel-metadata/*
 /_skbuild/*
+
+# MacOS
+.DS_Store

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ ci:
 exclude: ^(docs|studies|tests/samples|src/awkward/_typeparser/generated_parser.py)
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   - id: check-added-large-files
   - id: check-case-conflict
@@ -27,7 +27,7 @@ repos:
     additional_dependencies: [pyyaml]
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.6.4
+  rev: v0.7.2
   hooks:
   - id: ruff
     args: ["--fix", "--show-fixes"]
@@ -62,20 +62,20 @@ repos:
     files: ^tests/
 
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.29.2
+  rev: 0.29.4
   hooks:
     - id: check-github-workflows
       args: ["--verbose"]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.11.2
+  rev: v1.13.0
   hooks:
     - id: mypy
       files: src
       additional_dependencies:
         - numpy>=1.24
 
 - repo: https://github.com/abravalheri/validate-pyproject
-  rev: v0.19
+  rev: v0.22
   hooks:
     - id: validate-pyproject

README.md

@@ -230,6 +230,9 @@ Thanks especially to the gracious help of Awkward Array contributors (including
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/pfackeldey"><img src="https://avatars.githubusercontent.com/u/18463582?v=4?s=100" width="100px;" alt="Peter Fackeldey"/><br /><sub><b>Peter Fackeldey</b></sub></a><br /><a href="https://github.com/scikit-hep/awkward/commits?author=pfackeldey" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.ariostas.com"><img src="https://avatars.githubusercontent.com/u/7596837?v=4?s=100" width="100px;" alt="Andres Rios Tascon"/><br /><sub><b>Andres Rios Tascon</b></sub></a><br /><a href="https://github.com/scikit-hep/awkward/commits?author=ariostas" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/maxymnaumchyk"><img src="https://avatars.githubusercontent.com/u/70752300?v=4?s=100" width="100px;" alt="maxymnaumchyk"/><br /><sub><b>maxymnaumchyk</b></sub></a><br /><a href="https://github.com/scikit-hep/awkward/commits?author=maxymnaumchyk" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://tacaswell.github.io"><img src="https://avatars.githubusercontent.com/u/199813?v=4?s=100" width="100px;" alt="Thomas A Caswell"/><br /><sub><b>Thomas A Caswell</b></sub></a><br /><a href="#maintenance-tacaswell" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.nijho.lt"><img src="https://avatars.githubusercontent.com/u/6897215?v=4?s=100" width="100px;" alt="Bas Nijholt"/><br /><sub><b>Bas Nijholt</b></sub></a><br /><a href="#maintenance-basnijholt" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://nj-vs-vh.name/"><img src="https://avatars.githubusercontent.com/u/30616208?v=4?s=100" width="100px;" alt="Igor Vaiman"/><br /><sub><b>Igor Vaiman</b></sub></a><br /><a href="https://github.com/scikit-hep/awkward/commits?author=nj-vs-vh" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

awkward-cpp/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "awkward_cpp"
-version = "38"
+version = "39"
 dependencies = [
     "numpy>=1.18.0",
     "importlib_resources;python_version < \"3.9\""

dev/generate-kernel-signatures.py

@@ -429,7 +429,10 @@ def by_signature(cuda_kernel_templates):
                 special = [repr(spec["name"])]
                 [type_to_pytype(x["type"], special) for x in childfunc["args"]]
                 dirlist = [repr(x["dir"]) for x in childfunc["args"]]
-                ispointerlist = [repr("List" in x["type"]) for x in childfunc["args"]]
+                ispointerlist = [
+                    repr("List" in x["type"] or "ListArray-at" == x.get("role", None))
+                    for x in childfunc["args"]
+                ]
                 if spec["name"] in cuda_kernels_impl:
                     with open(
                         os.path.join(

docs/_toc.yml

@@ -4,12 +4,11 @@ title: "Awkward Array"
 defaults:
   titlesonly: True
 
-
 subtrees:
   - entries:
       - file: getting-started/index
         subtrees:
-            - entries:
+          - entries:
               - file: getting-started/what-is-an-awkward-array
               - file: getting-started/10-minutes-to-awkward-array
               - file: getting-started/uproot-awkward-columnar-hats
@@ -18,7 +17,7 @@ subtrees:
               - file: getting-started/papers-and-talks
       - file: user-guide/index
         subtrees:
-            - entries:
+          - entries:
               - file: user-guide/how-to-convert
                 title: "Converting arrays"
                 subtrees:
@@ -74,6 +73,13 @@ subtrees:
                       - file: user-guide/how-to-examine-checking-validity
                         title: "Checking validity"
 
+              - file: user-guide/how-to-array-properties
+                title: "Array properties"
+                subtrees:
+                  - entries:
+                      - file: user-guide/how-to-array-properties-named-axis
+                        title: "Named axes"
+
               - file: user-guide/how-to-math
                 title: "Numerical math"
                 subtrees:

docs/conf.py

@@ -140,7 +140,7 @@
 html_js_files = ["js/awkward.js"]
 
 # MyST settings
-myst_enable_extensions = ["colon_fence"]
+myst_enable_extensions = ["colon_fence", "deflist"]
 
 nb_execution_mode = "cache"
 nb_execution_raise_on_error = True

docs/reference/toctree.txt

@@ -39,6 +39,14 @@
     generated/ak.to_feather
     generated/ak.from_avro_file
 
+.. toctree::
+    :caption: Conversions for machine learning
+
+    generated/ak.from_raggedtensor
+    generated/ak.to_raggedtensor
+    generated/ak.from_torch
+    generated/ak.to_torch
+
 .. toctree::
     :caption: Converting to Pandas DataFrames