From 26ab9ce05248005b9032bab465efe788fb113263 Mon Sep 17 00:00:00 2001 From: Deyu Ming Date: Mon, 16 Dec 2024 11:06:57 +0000 Subject: [PATCH] Updates to devel version --- DESCRIPTION | 2 +- NEWS.md | 2 ++ R/initi_py.R | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5080cb0..e779c5e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: dgpsi Type: Package Title: Interface to 'dgpsi' for Deep and Linked Gaussian Process Emulations -Version: 2.5.0 +Version: 2.5.0-9000 Authors@R: c( person('Deyu', 'Ming', role = c('aut', 'cre', 'cph'), email = 'deyu.ming.16@ucl.ac.uk'), diff --git a/NEWS.md b/NEWS.md index eaec235..1ee848b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# dgpsi 2.5.0-9000 (development version) + # dgpsi 2.5.0 - Training times for DGP emulators are now approximately 30%-40% faster. - The computation of (D)GP predictions and Leave-One-Out (LOO) evaluations is now 6-7 times faster. diff --git a/R/initi_py.R b/R/initi_py.R index b36da23..77fbc2b 100644 --- a/R/initi_py.R +++ b/R/initi_py.R @@ -43,13 +43,13 @@ init_py <- function(py_ver = NULL, dgpsi_ver = NULL, reinstall = FALSE, uninstal if ( is.null(py_ver) ) py_ver <- '3.9.13' if ( is.null(dgpsi_ver) ) { ##For devel version - #dgpsi_ver <- c('cython>=0.29.30', 'dill>=0.3.2, <=0.3.5.1', 'jupyter>=1.0.0', 'matplotlib-base>=3.2.1', 'numba >=0.51.2', - # 'numpy >=1.18.2', 'pathos ==0.2.9', 'multiprocess ==0.70.13', 'psutil >=5.8.0', 'pybind11 >=2.10.0', 'pythran >=0.11.0', - # 'scikit-build >=0.15.0', 'scikit-learn >=0.22.0', 'scipy >=1.4.1', 'tqdm >=4.50.2', 'tabulate >=0.8.7', 'faiss-cpu >=1.7.4') - #env_name <- 'dgp_si_R_2_4_0_9000' + dgpsi_ver <- c('cython>=0.29.30', 'dill>=0.3.2, <=0.3.5.1', 'jupyter>=1.0.0', 'matplotlib-base>=3.2.1', 'numba >=0.51.2', + 'numpy >=1.18.2', 'pathos ==0.2.9', 'multiprocess ==0.70.13', 'psutil >=5.8.0', 'pybind11 >=2.10.0', 'pythran >=0.11.0', + 'scikit-build >=0.15.0', 'scikit-learn >=0.22.0', 'scipy >=1.4.1', 'tqdm >=4.50.2', 'tabulate >=0.8.7', 'faiss-cpu >=1.7.4') + env_name <- 'dgp_si_R_2_5_0_9000' ##For release version - dgpsi_ver <- 'dgpsi==2.5.0' - env_name <- 'dgp_si_R_2_5_0' + #dgpsi_ver <- 'dgpsi==2.5.0' + #env_name <- 'dgp_si_R_2_5_0' } else { env_name <- paste('dgp_si_R_', gsub(".", "_", dgpsi_ver,fixed=TRUE), sep = "") dgpsi_ver <- paste('dgpsi==', dgpsi_ver, sep = "")