Merge remote-tracking branch 'origin/master' into gd/fix

JuliaDiff · Oct 7, 2024 · fe7922a · fe7922a
2 parents ac17d0b + 4e36edd
commit fe7922a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -40,6 +40,7 @@ jobs:
       - uses: julia-actions/julia-processcoverage@v1
         with:
           directories: src,ext
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: lcov.info
diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml
@@ -14,7 +14,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        julia-version: [1,1.10]
+        julia-version:
+          - '1' # Latest Release
+          - '1.10' # future LTS
         os: [ubuntu-latest]
         package:
           - {user: SciML, repo: OrdinaryDiffEq.jl, group: InterfaceII}

diff --git a/ext/SparseDiffToolsPolyesterExt.jl b/ext/SparseDiffToolsPolyesterExt.jl
@@ -58,7 +58,7 @@ function polyesterforwarddiff_color_jacobian(J::AbstractMatrix{<:Number}, f::F,
                              if colorvec[cols_index[idx]] == color_i]
                 rows_index_c = rows_index[pick_inds]
                 cols_index_c = cols_index[pick_inds]
-                @inbounds @simd for i in 1:length(rows_index_c)
+                @simd for i in eachindex(rows_index_c, cols_index_c)
                     J[rows_index_c[i], cols_index_c[i]] = dx[rows_index_c[i]]
                 end
                 color_i += 1

diff --git a/src/coloring/matrix2graph.jl b/src/coloring/matrix2graph.jl
@@ -45,7 +45,7 @@ function matrix2graph(sparse_matrix::AbstractSparseMatrix{<:Number},
 
     if partition_by_rows
         rows_by_cols = _rows_by_cols(rows_index, cols_index)
-        @inbounds for (cur_row, cur_col) in zip(rows_index, cols_index)
+        for (cur_row, cur_col) in zip(rows_index, cols_index)
             if !isempty(rows_by_cols[cur_col])
                 for next_row in rows_by_cols[cur_col]
                     if next_row < cur_row
@@ -56,7 +56,7 @@ function matrix2graph(sparse_matrix::AbstractSparseMatrix{<:Number},
         end
     else
         cols_by_rows = _cols_by_rows(rows_index, cols_index)
-        @inbounds for (cur_row, cur_col) in zip(rows_index, cols_index)
+        for (cur_row, cur_col) in zip(rows_index, cols_index)
             if !isempty(cols_by_rows[cur_row])
                 for next_col in cols_by_rows[cur_row]
                     if next_col < cur_col

diff --git a/src/differentiation/compute_jacobian_ad.jl b/src/differentiation/compute_jacobian_ad.jl
@@ -367,7 +367,7 @@ function forwarddiff_color_jacobian!(J::AbstractMatrix{<:Number},
         partial_i = p[i]
 
         if vect isa Array
-            @inbounds @simd ivdep for j in eachindex(vect)
+            @inbounds @simd ivdep for j in eachindex(vect, vecx, partial_i)
                 vect[j] = eltype(t)(vecx[j], ForwardDiff.Partials(partial_i[j]))
             end
         else
@@ -378,7 +378,7 @@ function forwarddiff_color_jacobian!(J::AbstractMatrix{<:Number},
         if !(sparsity isa Nothing)
             for j in 1:chunksize
                 if dx isa Array
-                    @inbounds @simd for k in eachindex(dx)
+                    @inbounds @simd for k in eachindex(dx, fx)
                         dx[k] = partials(fx[k], j)
                     end
                 else
@@ -430,7 +430,7 @@ function forwarddiff_color_jacobian!(J::AbstractMatrix{<:Number},
                 col_index = (i - 1) * chunksize + j
                 (col_index > ncols) && return J
                 if J isa Array
-                    @inbounds @simd for k in 1:size(J, 1)
+                    @simd for k in axes(J, 1)
                         J[k, col_index] = partials(vecfx[k], j)
                     end
                 else