Merge branch 'master' into jdf/alt_findminmax

Author: ChrisRackauckas

.github/dependabot.yml

@@ -0,0 +1,7 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/CompatHelper.yml

@@ -0,0 +1,45 @@
+name: CompatHelper
+on:
+  schedule:
+    - cron: 0 0 * * *
+  workflow_dispatch:
+permissions:
+  contents: write
+  pull-requests: write
+jobs:
+  CompatHelper:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if Julia is already available in the PATH
+        id: julia_in_path
+        run: which julia
+        continue-on-error: true
+      - name: Install Julia, but only if it is not already available in the PATH
+        uses: julia-actions/setup-julia@v2
+        with:
+          version: '1'
+          arch: ${{ runner.arch }}
+        if: steps.julia_in_path.outcome != 'success'
+      - name: "Add the General registry via Git"
+        run: |
+          import Pkg
+          ENV["JULIA_PKG_SERVER"] = ""
+          Pkg.Registry.add("General")
+        shell: julia --color=yes {0}
+      - name: "Install CompatHelper"
+        run: |
+          import Pkg
+          name = "CompatHelper"
+          uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
+          version = "3"
+          Pkg.add(; name, uuid, version)
+        shell: julia --color=yes {0}
+      - name: "Run CompatHelper"
+        run: |
+          import CompatHelper
+          CompatHelper.main()
+        shell: julia --color=yes {0}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
+          # COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}

.github/workflows/Invalidations.yml

@@ -0,0 +1,40 @@
+name: Invalidations
+
+on:
+  pull_request:
+
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: always.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  evaluate:
+    # Only run on PRs to the default branch.
+    # In the PR trigger above branches can be specified only explicitly whereas this check should work for master, main, or any other default branch
+    if: github.base_ref == github.event.repository.default_branch
+    runs-on: ubuntu-latest
+    steps:
+    - uses: julia-actions/setup-julia@v1
+      with:
+        version: '1'
+    - uses: actions/checkout@v3
+    - uses: julia-actions/julia-buildpkg@v1
+    - uses: julia-actions/julia-invalidations@v1
+      id: invs_pr
+
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.repository.default_branch }}
+    - uses: julia-actions/julia-buildpkg@v1
+    - uses: julia-actions/julia-invalidations@v1
+      id: invs_default
+    
+    - name: Report invalidation counts
+      run: |
+        echo "Invalidations on default branch: ${{ steps.invs_default.outputs.total }} (${{ steps.invs_default.outputs.deps }} via deps)" >> $GITHUB_STEP_SUMMARY
+        echo "This branch: ${{ steps.invs_pr.outputs.total }} (${{ steps.invs_pr.outputs.deps }} via deps)" >> $GITHUB_STEP_SUMMARY
+    - name: Check if the PR does increase number of invalidations
+      if: steps.invs_pr.outputs.total > steps.invs_default.outputs.total
+      run: exit 1

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ['1.6', '1', 'nightly']  # Test against LTS, current minor release, and nightly
+        version: ['1.10', '1', 'pre']  # Test against LTS, current minor release, and pre-releases
         os:
           - ubuntu-latest
           - macOS-latest
@@ -23,12 +23,12 @@ jobs:
           - os: macOS-latest
             arch: x86
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         env:
           cache-name: cache-artifacts
         with:
@@ -41,6 +41,7 @@ jobs:
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v5
         with:
-          file: lcov.info
+          files: lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}

Project.toml

@@ -1,14 +1,14 @@
 name = "NaNMath"
 uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-repo = "https://github.com/mlubin/NaNMath.jl.git"
+repo = "https://github.com/JuliaMath/NaNMath.jl.git"
 authors = ["Miles Lubin"]
-version = "1.0.1"
+version = "1.1.0"
 
 [deps]
 OpenLibm_jll = "05823500-19ac-5b8b-9628-191a04bc5112"
 
 [compat]
-julia = "1.6"
+julia = "1.10"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

README.md

@@ -1,6 +1,8 @@
 # NaNMath
 
-[![deps](https://juliahub.com/docs/NaNMath/deps.svg)](https://juliahub.com/ui/Packages/NaNMath/k9Y1O?t=2)
+[![CI](https://github.com/JuliaMath/NaNMath.jl/actions/workflows/ci.yml/badge.svg)](https://github.com/JuliaMath/NaNMath.jl/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/JuliaMath/NaNMath.jl/graph/badge.svg?token=uoFvfoAd4T)](https://codecov.io/gh/JuliaMath/NaNMath.jl)
+[![deps](https://juliahub.com/docs/General/NaNMath/stable/deps.svg)](https://juliahub.com/ui/Packages/General/NaNMath?t=2)
 
 Implementations of basic math functions which return ``NaN`` instead of throwing a ``DomainError``.
 

src/NaNMath.jl

@@ -9,20 +9,38 @@ for f in (:sin, :cos, :tan, :asin, :acos, :acosh, :atanh, :log, :log2, :log10,
         ($f)(x::Float64) = ccall(($(string(f)),libm), Float64, (Float64,), x)
         ($f)(x::Float32) = ccall(($(string(f,"f")),libm), Float32, (Float32,), x)
         ($f)(x::Real) = ($f)(float(x))
+        if $f !== :lgamma
+            ($f)(x) = (Base.$f)(x)
+        end
     end
 end
 
+for f in (:sqrt,)
+    @eval ($f)(x) = (Base.$f)(x)
+end
+
+for f in (:max, :min)
+    @eval ($f)(x, y) = (Base.$f)(x, y)
+end
+
 # Would be more efficient to remove the domain check in Base.sqrt(),
 # but this doesn't seem easy to do.
-sqrt(x::Real) = x < 0.0 ? NaN : Base.sqrt(x)
+sqrt(x::T) where {T<:AbstractFloat} = x < 0.0 ? T(NaN) : Base.sqrt(x)
+sqrt(x::Real) = sqrt(float(x))
 
 # Don't override built-in ^ operator
 pow(x::Float64, y::Float64) = ccall((:pow,libm),  Float64, (Float64,Float64), x, y)
 pow(x::Float32, y::Float32) = ccall((:powf,libm), Float32, (Float32,Float32), x, y)
 # We `promote` first before converting to floating pointing numbers to ensure that
 # e.g. `pow(::Float32, ::Int)` ends up calling `pow(::Float32, ::Float32)`
-pow(x::Number, y::Number) = pow(promote(x, y)...)
-pow(x::T, y::T) where {T<:Number} = pow(float(x), float(y))
+pow(x::Real, y::Real) = pow(promote(x, y)...)
+pow(x::T, y::T) where {T<:Real} = pow(float(x), float(y))
+pow(x, y) = ^(x, y)
+
+# The following combinations are safe, so we can fall back to ^
+pow(x::Number, y::Integer) = x^y
+pow(x::Real, y::Integer) = x^y
+pow(x::Complex, y::Complex) = x^y
 
 """
 NaNMath.sum(A)

test/runtests.jl

@@ -7,7 +7,6 @@ using Test
 @test isnan(NaNMath.pow(-1.5f0,2.3f0))
 @test isnan(NaNMath.pow(-1.5,2.3f0))
 @test isnan(NaNMath.pow(-1.5f0,2.3))
-@test NaNMath.pow(-1,2) isa Float64
 @test NaNMath.pow(-1.5f0,2) isa Float32
 @test NaNMath.pow(-1.5f0,2//1) isa Float32
 @test NaNMath.pow(-1.5f0,2.3f0) isa Float32
@@ -16,8 +15,22 @@ using Test
 @test NaNMath.pow(-1.5,2//1) isa Float64
 @test NaNMath.pow(-1.5,2.3f0) isa Float64
 @test NaNMath.pow(-1.5,2.3) isa Float64
+@test NaNMath.pow(-1,2) === 1
+@test NaNMath.pow(2,2) === 4
+@test NaNMath.pow(1.0, 1.0+im) === 1.0 + 0.0im
+@test NaNMath.pow(1.0+im, 1) === 1.0 + 1.0im
+@test NaNMath.pow(1.0+im, 1.0) === 1.0 + 1.0im
 @test isnan(NaNMath.sqrt(-5))
 @test NaNMath.sqrt(5) == Base.sqrt(5)
+@test isnan(NaNMath.sqrt(-3.2f0)) && NaNMath.sqrt(-3.2f0) isa Float32
+@test isnan(NaNMath.sqrt(-BigFloat(7.0))) && NaNMath.sqrt(-BigFloat(7.0)) isa BigFloat 
+@test isnan(NaNMath.sqrt(-7)) && NaNMath.sqrt(-7) isa Float64 
+@inferred NaNMath.sqrt(5)
+@inferred NaNMath.sqrt(5.0)
+@inferred NaNMath.sqrt(5.0f0)
+@inferred NaNMath.sqrt(-5)
+@inferred NaNMath.sqrt(-5.0)
+@inferred NaNMath.sqrt(-5.0f0)
 @test NaNMath.sum([1., 2., NaN]) == 3.0
 @test NaNMath.sum([1. 2.; NaN 1.]) == 4.0
 @test isnan(NaNMath.sum([NaN, NaN]))
@@ -202,4 +215,19 @@ end
     @test NaNMath.argmax(x) === CartesianIndex(1, 2)
     @test NaNMath.argmin(exp,x) === -1.0
     @test NaNMath.argmax(exp,x) === 3.0
-end
+end
+
+# Test forwarding
+x = 1 + 2im
+for f in (:sin, :cos, :tan, :asin, :acos, :acosh, :atanh, :log, :log2, :log10,
+          :log1p, :sqrt)
+    @test @eval (NaNMath.$f)(x) == $f(x)
+end
+
+struct A end
+Base.isless(::A, ::A) = false
+y = A()
+for f in (:max, :min)
+    @test @eval (NaNMath.$f)(y, y) == $f(y, y)
+end
+@test NaNMath.pow(x, x) == ^(x, x)