Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #372

Merged
merged 27 commits into from
Oct 2, 2024
Merged

Dev #372

Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e3f9539
export convert_cv_index_rset; skip_on_ci; expect_warning
mitchellmanware Sep 24, 2024
106e194
Merge pull request #360 from NIEHS/mm-tests-0820
kyle-messier Sep 25, 2024
d922834
rebasing + gitignore for tokens
kyle-messier Sep 30, 2024
819dcd2
remove old test data
kyle-messier Sep 30, 2024
524fcd7
Merge pull request #365 from NIEHS/pre-dev-fix
kyle-messier Sep 30, 2024
fc275d2
set up container, def, and archive old bash scripts
kyle-messier Oct 1, 2024
bad244e
add dev to branches triggering GH actions
kyle-messier Oct 1, 2024
45a2170
Merge pull request #368 from NIEHS/container-01
kyle-messier Oct 1, 2024
30b0f89
def files, bash scipts for containers, testing yaml
kyle-messier Oct 1, 2024
4c42f5a
fixing [on] typo
kyle-messier Oct 1, 2024
969565b
GH action path correction
kyle-messier Oct 1, 2024
66c65aa
name change
kyle-messier Oct 1, 2024
27d64e3
def file was wrong name
kyle-messier Oct 1, 2024
f4db895
rel path update for container build
kyle-messier Oct 1, 2024
89a2f95
path fix, fakeroot
kyle-messier Oct 1, 2024
8af11cd
path change for test functions
kyle-messier Oct 1, 2024
7afc578
cache fixing attempt
kyle-messier Oct 1, 2024
ab3dfb7
path fix attempts
kyle-messier Oct 1, 2024
775c98d
change order of yaml names to include new R test file in mnt
kyle-messier Oct 1, 2024
691aa16
remove _targets/ path from mount
kyle-messier Oct 1, 2024
ddee948
cache updating and check sections
kyle-messier Oct 1, 2024
ee9da0b
test cache of sif
kyle-messier Oct 1, 2024
401a78a
Merge branch 'dev' into container-01
kyle-messier Oct 1, 2024
e460622
Merge pull request #369 from NIEHS/container-01
kyle-messier Oct 1, 2024
51a6733
_targets.R, test and run bash scripts
kyle-messier Oct 2, 2024
8790b40
Merge branch 'dev' into container-01
kyle-messier Oct 2, 2024
7d17aba
Merge pull request #370 from NIEHS/container-01
kyle-messier Oct 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ export(calc_geos_strict)
export(calc_gmted_direct)
export(calc_narr2)
export(calculate)
export(convert_cv_index_rset)
export(feature_raw_download)
export(fit_base_learner)
export(fit_base_tune)
1 change: 1 addition & 0 deletions R/base_learner.R
Original file line number Diff line number Diff line change
@@ -506,6 +506,7 @@ assign_learner_cv <-
#' training-test data.frames and a column of labels.
#' @author Insang Song
#' @importFrom rsample make_splits manual_rset
#' @export
convert_cv_index_rset <-
function(
cvindex,
1 change: 1 addition & 0 deletions tests/testthat/test-calculate.R
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
################################################################################
##### par_narr
testthat::test_that("par_narr (weasd + omega)", {
testthat::skip_on_ci()
withr::local_package("rlang")

# sample location
3 changes: 2 additions & 1 deletion tests/testthat/test-injection.R
Original file line number Diff line number Diff line change
@@ -123,7 +123,7 @@ testthat::test_that("set_target_years", {

################################################################################
##### inject_calc
testthat::test_that("inject_calc (hms + hms)", {
testthat::test_that("inject_calc (hms + nei)", {

withr::local_package("rlang")

@@ -188,6 +188,7 @@ testthat::test_that("inject_calc (hms + hms)", {
crs = "EPSG:4326"
)

testthat::skip_on_ci()
# expect no errors (nei)
testthat::expect_no_error(
nei_injected <- inject_calculate(
2 changes: 1 addition & 1 deletion tests/testthat/test-meta.R
Original file line number Diff line number Diff line change
@@ -257,7 +257,7 @@ testthat::test_that("predict_meta_learner", {
)

# expect no error for meta fit
testthat::expect_no_error(
testthat::expect_warning(
meta4 <- fit_meta_learner(
data = dt_meta,
p_col_sel = 0.5,
74 changes: 3 additions & 71 deletions tools/targets-old/targets_configuration.csv
Original file line number Diff line number Diff line change
@@ -1,71 +1,3 @@
"index","last_updated","command","name_targets_short","value","class","name_targets_long","rclass","role_suffix","stage","source","spacetime","remarks"
0,"2024/3/15","paste0","root_custom","../../../../group/set/Projects/NRT-AP-Model/","path","character_feature_userroot","character","feature_userroot","","","",""
1,"2024/3/15","getwd","root_absolute","missing","path","character_feature_absoluteroot","character","feature_absoluteroot","","","",""
2,"2024/3/15","paste0","root_relative",".","path","character_feature_relativeroot","character","feature_relativeroot","","","",""
3,"2024/3/15","file.path","dir_input","input","path","character_feature_raw","character","feature","raw","","",""
4,"2024/3/15","file.path","dir_output","output","path","character_feature_base_fit","character","feature_base","fit","","",""
5,"2024/3/15","file.path","dir_input_aqs","input/aqs","path","character_feature_raw_aqs","character","feature","raw","aqs","",""
6,"2024/3/15","file.path","dir_input_nei","input/nei","path","character_feature_raw_nei","character","feature","raw","nei","",""
7,"2024/3/15","file.path","dir_input_narr","input/narr","path","character_feature_raw_narr","character","feature","raw","narr","",""
8,"2024/3/15","read.csv","file_narr_variables","inst/targets/narr_variables.csv","path","character_feature_lookup_raw_narr","character","feature_lookup","raw","narr","",""
9,"2024/3/15","file.path","dir_input_modis","input/modis","path","character_feature_raw_modis","character","feature","raw","modis","",""
10,"2024/3/15","file.path","dir_input_nlcd","input/nlcd/raw","path","character_feature_raw_nlcd","character","feature","raw","nlcd","",""
11,"2024/3/15","file.path","dir_input_ecoregions","input/ecoregions","path","character_feature_raw_ecoregions","character","feature","raw","ecoregions","",""
12,"2024/3/15","file.path","dir_input_koppen","input/koppen_geiger","path","character_feature_raw_koppengeiger","character","feature","raw","koppengeiger","",""
13,"2024/3/15","file.path","dir_input_gmted","input/gmted","path","character_feature_raw_gmted","character","feature","raw","gmted","",""
14,"2024/3/15","file.path","dir_input_sedac_population","input/sedac_population","path","character_feature_raw_population","character","feature","raw","population","",""
15,"2024/3/15","file.path","dir_input_sedac_groads","input/sedac_groads","path","character_feature_raw_groads","character","feature","raw","groads","",""
16,"2024/3/15","file.path","dir_input_hms","input/HMS_Smoke","path","character_feature_raw_hms","character","feature","raw","hms","",""
17,"2024/3/15","file.path","dir_input_tri","input/tri","path","character_feature_raw_tri","character","feature","raw","tri","",""
18,"2024/3/15","file.path","dir_input_geoscf","input/geos","path","character_feature_raw_geoscf","character","feature","raw","geoscf","",""
19,"2024/3/15","file.path","dir_input_modis_mod11","input/modis/raw/61/MOD11A1","path","character_feature_dir_raw_modis_mod11","character","feature_dir","raw","modis_mod11","",""
20,"2024/3/15","file.path","dir_input_modis_mod13","input/modis/raw/61/MOD13A2","path","character_feature_dir_raw_modis_mod13","character","feature_dir","raw","modis_mod13","",""
21,"2024/3/15","file.path","dir_input_modis_mcd19","input/modis/raw/61/MCD19A2","path","character_feature_dir_raw_modis_mcd19","character","feature_dir","raw","modis_mcd19","",""
22,"2024/3/15","file.path","dir_input_modis_mod09","input/modis/raw/61/MOD09GA","path","character_feature_dir_raw_modis_mod09","character","feature_dir","raw","modis_mod09","",""
23,"2024/3/15","file.path","dir_input_modis_mod06","input/modis/raw/61/MOD06_L2","path","character_feature_dir_raw_modis_mod06","character","feature_dir","raw","modis_mod06","",""
24,"2024/3/15","file.path","dir_input_viirs","input/modis/raw/5000/VNP46A2","path","character_feature_dir_raw_viirs","character","feature_dir","raw","viirs","",""
30,"2024/3/15","paste0","fileext_aqs","*.csv$","extension","character_feature_fileext_calc_aqs","character","feature_fileext","calc","aqs","",""
31,"2024/3/15","paste0","fileext_nei","*.csv$","extension","character_feature_fileext_calc_nei","character","feature_fileext","calc","nei","",""
32,"2024/3/15","paste0","fileext_narr","*.nc$","extension","character_feature_fileext_calc_narr","character","feature_fileext","calc","narr","",""
34,"2024/3/15","paste0","fileext_modis","*.hdf$","extension","character_feature_fileext_calc_modis","character","feature_fileext","calc","modis","",""
35,"2024/3/15","paste0","fileext_viirs","*.h5$","extension","character_feature_fileext_calc_viirs","character","feature_fileext","calc","viirs","",""
36,"2024/3/15","paste0","fileext_nlcd","*.img$","extension","character_feature_fileext_calc_nlcd","character","feature_fileext","calc","nlcd","",""
37,"2024/3/15","paste0","fileext_ecoregions","*.shp$","extension","character_feature_fileext_calc_ecoregions","character","feature_fileext","calc","ecoregions","",""
38,"2024/3/15","paste0","fileext_koppen","*.tif$","extension","character_feature_fileext_calc_koppengeiger","character","feature_fileext","calc","koppengeiger","",""
39,"2024/3/15","paste0","fileext_gmted","*.nc$","extension","character_feature_fileext_calc_gmted","character","feature_fileext","calc","gmted","",""
40,"2024/3/15","paste0","fileext_sedac_population","*.shp$","extension","character_feature_fileext_calc_population","character","feature_fileext","calc","population","",""
41,"2024/3/15","paste0","fileext_sedac_groads","*.tif$","extension","character_feature_fileext_calc_groads","character","feature_fileext","calc","groads","",""
42,"2024/3/15","paste0","fileext_hms","*.shp$","extension","character_feature_fileext_calc_hms","character","feature_fileext","calc","hms","",""
43,"2024/3/15","paste0","fileext_tri","*.nc$","extension","character_feature_fileext_calc_tri","character","feature_fileext","calc","tri","",""
44,"2024/3/15","paste0","fileext_geoscf","*.nc$","extension","character_feature_fileext_calc_geoscf","character","feature_fileext","calc","geoscf","",""
45,"2024/3/15","paste0","file_list_mod11","mod11_static_list.txt","status","character_feature_list_calc_modis_mod11","character","feature_list","calc","modis_mod11","",""
46,"2024/3/15","paste0","file_list_mod13","mod13_static_list.txt","status","character_feature_list_calc_modis_mod13","character","feature_list","calc","modis_mod13","",""
47,"2024/3/15","paste0","file_list_mcd19","mcd19_static_list.txt","status","character_feature_list_calc_modis_mcd19","character","feature_list","calc","modis_mcd19","",""
48,"2024/3/15","paste0","file_list_mod06","mod06_static_list.txt","status","character_feature_list_calc_modis_mod06","character","feature_list","calc","modis_mod06","",""
49,"2024/3/15","paste0","file_list_mod09","mod09_static_list.txt","status","character_feature_list_calc_modis_mod09","character","feature_list","calc","modis_mod09","",""
50,"2024/3/15","paste0","file_list_tri","tri_static_list.txt","status","character_feature_list_calc_tri","character","feature_list","calc","tri","",""
67,"2024/3/15","paste0","char_siteid","site_id","identifier","character_feature_pointid_calc","character","feature_pointid","calc","","",""
68,"2024/3/15","paste0","char_timeid","time","identifier","character_feature_timeid_calc","character","feature_timeid","calc","","",""
69,"2024/3/15","paste0","file_feat_dummies","feature_dummies.rds","status","datatable_feature_timedummy_calc","datatable","feature_timedummy","calc","","",""
70,"2024/3/15","paste0","file_aqs_pm","aqs_cleaned.rds","status","datatable_feature_pm25_calc_aqs","datatable","feature_pm25","calc","aqs","",""
71,"2024/3/15","paste0","name_dep","pm25","label","character_feature_pm25name_process","character","feature_pm25name","process","","",""
72,"2024/3/15","readLines","file_name_indep","list_covariate_names.txt","label","","","","","","","deprecated?"
73,"2024/3/15","paste0","file_grid_prediction","prediction_grid.rds","status","datatable_prediction_locs_calc","datatable","prediction_locs","calc","","grid",""
74,"2024/3/15","as.integer","nthreads","16","setting","integer_feature_nthreads_calc","integer","feature_nthreads","calc","","",""
91,"2024/3/15","file.path","dir_input_nei2017","input/nei/nei_onroad_byregions_2017","path","character_feature_dir_calc_nei_2017","character","feature_dir","calc","nei","2017",""
92,"2024/3/15","file.path","dir_input_nei2020","input/nei/nei_onroad_byregions_2020","path","character_feature_dir_calc_nei_2020","character","feature_dir","calc","nei","2020",""
96,"2024/3/15","paste0","file_input_sedac_groads","groads-v1-americas-gdb/gROADS-v1-americas.gdb","path","character_feature_dir_calc_groads","character","feature_dir","calc","groads","",""
97,"2024/3/15","paste0","file_input_sedac_population","gpw_v4_population_density_adjusted_to_2015_unwpp_country_totals_rev11_2020_30_sec.tif","path","character_feature_dir_calc_population","character","feature_dir","calc","population","",""
93,"2024/4/1","as.Date","date_start","2020-01-01","domain","character_feature_calcdate_start","character","feature","calc","","date_start",""
94,"2024/4/1","as.Date","date_end","2020-12-31","domain","character_feature_calcdate_end","character","feature","calc","","date_end",""
95,"2024/3/15","strsplit","extent","-126|-62|22|52","domain","character_feature_calcextent","character","feature","calc","","extent",""
98,"2024/3/29","strsplit","nei_year_sequence","2017|2017|2020|2020|2020","domain","character_feature_calc_nei_years","character","feature","calc","nei","years",""
99,"2024/3/29","strsplit","nlcd_year_sequence","2019|2019|2019|2021|2021","domain","character_feature_calc_nlcd_years","character","feature","calc","nlcd","years",""
101,"2024/3/29","strsplit","sedac_population_year","2020|2020|2020|2020|2020","domain","character_feature_calc_population_years","character","feature","calc","population","years",""
1001,"2024/3/29","paste0","nei_year_sequence_test","2020","domain","character_feature_calc_test_nei_years","character","feature","calc_test","nei","years",""
1002,"2024/3/29","paste0","nlcd_year_sequence_test","2019","domain","character_feature_calc_test","character","feature","calc_test","","",""
1003,"2024/3/29","as.integer","sedac_population_year_test","2020","domain","character_feature_calc_test_population_year","character","feature","calc_test","","",""
1004,"2024/3/29","strsplit","tri_year_sequence_test","2020|2020","domain","character_feature_calc_test_tri_year","character","feature","calc_test","","",""
100,"2024/3/29","as.integer","nthreads_calc","20","setting","","","","","","","deprecated"
102,"2024/3/29","strsplit","tri_year_sequence","2018|2019|2020|2021|2022","domain","character_feature_calc_tri","character","feature","calc","tri","",""
103,"2024/3/29","paste0","slurm_user_email","[email protected]","setting","character_config_calc_useremail","character","config","calc","useremail","",""
version https://git-lfs.github.com/spec/v1
oid sha256:4340251ee65e4b1de71596e095ada2c7210d7a21b523e09852a87d0a8bb5fa8d
size 10898
4 changes: 3 additions & 1 deletion tools/targets-old/targets_lookup.csv
Git LFS file not shown