Merge pull request #601 from rstudio/fixes-for-numpy2

Fixes for NumPy 2.0

Author: t-kalinowski

NEWS.md

@@ -2,6 +2,7 @@
 
 - Fixed an issue where GPUs would not be found when running on Windows
   WSL Linux (reported in rstudio/keras3#1456, fixed in #599)
+- Fixes for NumPy 2.0 (#601)
 
 # tensorflow 2.16.0
 
@@ -10,7 +11,6 @@
 - If `install_tensorflow()` detects a GPU on Linux, it will automatically 
   install the cuda package and configure required symlinks for cudnn and ptxax.
 
-
 # tensorflow 2.15.0
 
 - `install_tensorflow()` installs TensorFlow v2.15 by default

R/install.R

@@ -198,6 +198,8 @@ function(method = c("auto", "virtualenv", "conda"),
     as.character(extra_packages)
   ))
 
+  if (isTRUE(extract_numeric_version(version) <= "2.17"))
+    packages <- c("numpy<2", packages)
 
   if (isTRUE(metal)) repeat {
     tf_ver <- extract_numeric_version(tf_package_spec)
@@ -347,7 +349,10 @@ parse_tensorflow_version <- function(version) {
 
 
 extract_numeric_version <- function(x, strict = FALSE) {
-  x <- gsub("[^0-9.]+", "", as.character(x), perl = TRUE)
+  x <- as.character(x)
+  x <- gsub("-", ".", x, fixed = TRUE)
+  x <- gsub("[^0-9.]", "", x, perl = TRUE)
+  x <- gsub("\\.+", ".", x)
   x <- sub("^\\.+", "", x)
   x <- sub("\\.+$", "", x)
   numeric_version(x, strict = strict)