From 72992245093395ab32a807a28f1d8515338e49d8 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Mon, 8 Jul 2024 16:49:39 -0700 Subject: [PATCH 1/3] apply tomas patch --- src/internal/fast_float/fast_float.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/internal/fast_float/fast_float.h b/src/internal/fast_float/fast_float.h index 8c216e2f..74544393 100644 --- a/src/internal/fast_float/fast_float.h +++ b/src/internal/fast_float/fast_float.h @@ -15,9 +15,9 @@ // MIT License Notice // // MIT License -// +// // Copyright (c) 2021 The fast_float authors -// +// // Permission is hereby granted, free of charge, to any // person obtaining a copy of this software and associated // documentation files (the "Software"), to deal in the @@ -27,11 +27,11 @@ // the Software, and to permit persons to whom the Software // is furnished to do so, subject to the following // conditions: -// +// // The above copyright notice and this permission notice // shall be included in all copies or substantial portions // of the Software. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF // ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED // TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A @@ -48,9 +48,9 @@ // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -304,7 +304,7 @@ fastfloat_really_inline uint64_t _umul128(uint64_t ab, uint64_t cd, fastfloat_really_inline value128 full_multiplication(uint64_t a, uint64_t b) { value128 answer; -#if defined(_M_ARM64) && !defined(_WIN32) +#if defined(_M_ARM64) && defined(_MSC_VER) // ARM64 has native support for 64-bit multiplications, no need to emulate answer.high = __umulh(a, b); answer.low = a * b; @@ -1495,9 +1495,9 @@ namespace detail { * where * p = log(5**q)/log(2) = q * log(5)/log(2) * - * For negative values of q in (-400,0), we have that + * For negative values of q in (-400,0), we have that * f = (((152170 + 65536) * q ) >> 16); - * is equal to + * is equal to * -ceil(p) + q * where * p = log(5**-q)/log(2) = -q * log(5)/log(2) @@ -1568,7 +1568,7 @@ adjusted_mantissa compute_float(int64_t q, uint64_t w) noexcept { // In some very rare cases, this could happen, in which case we might need a more accurate // computation that what we can provide cheaply. This is very, very unlikely. // - const bool inside_safe_exponent = (q >= -27) && (q <= 55); // always good because 5**q <2**128 when q>=0, + const bool inside_safe_exponent = (q >= -27) && (q <= 55); // always good because 5**q <2**128 when q>=0, // and otherwise, for q<0, we have 5**-q<2**64 and the 128-bit reciprocal allows for exact computation. if(!inside_safe_exponent) { return compute_error_scaled(q, product.high, lz); From 50d85e1a1d0a50d0dc2390923d574b7189e4843a Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Mon, 8 Jul 2024 16:52:20 -0700 Subject: [PATCH 2/3] news --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 9bfd2604..ddcf392b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,7 @@ - Add `wk_crs()` and `wk_set_crs()` methods for `bbox` (#213) - Fix wk_trans inconsistent meta flags handling (#217) +- Ensure package builds on arm64 for Windows (#220) # wk 0.9.1 From f9237f15af38fb7c78d15c6118ad2556ab0f17b2 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Mon, 8 Jul 2024 17:02:39 -0700 Subject: [PATCH 3/3] remove old windows from ci --- .github/workflows/R-CMD-check.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 71034144..52c2b277 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -18,8 +18,6 @@ jobs: fail-fast: false matrix: config: - # Checks gcc 4.8 - - {os: windows-latest, r: '3.6'} - {os: macOS-latest, r: 'release'} - {os: windows-latest, r: 'release'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}