diff --git a/tools/models/scvi/scvi-config.yaml b/tools/models/scvi/scvi-config.yaml index 656d45cd1..b8f017fc3 100644 --- a/tools/models/scvi/scvi-config.yaml +++ b/tools/models/scvi/scvi-config.yaml @@ -5,6 +5,8 @@ census: null obs_query_model: # Required when loading data for model training. Do not change. 'is_primary_data == True and nnz >= 300' + version: + "2024-05-20" hvg: top_n_hvg: 8000 @@ -19,7 +21,7 @@ model: filename: "scvi.model" n_hidden: 512 n_latent: 50 - n_layers: 1 + n_layers: 2 train: max_epochs: 100 batch_size: 1024 diff --git a/tools/models/scvi/scvi-create-latent-update.py b/tools/models/scvi/scvi-create-latent-update.py index 5aeaa34b6..0a70e2596 100644 --- a/tools/models/scvi/scvi-create-latent-update.py +++ b/tools/models/scvi/scvi-create-latent-update.py @@ -14,12 +14,13 @@ with open(file) as f: config = yaml.safe_load(f) - census = cellxgene_census.open_soma(census_version="2023-12-15") - census_config = config.get("census") experiment_name = census_config.get("organism") obs_value_filter = census_config.get("obs_query") + version = census_config.get("version") + census = cellxgene_census.open_soma(census_version=version) + hv = pd.read_pickle("hv_genes.pkl") hv_idx = hv[hv].index @@ -44,7 +45,7 @@ adata.var.set_index("feature_id", inplace=True) - idx = query.obs(column_names=["soma_joinid"]).concat().to_pandas().index.to_numpy() + idx = query.obs(column_names=["soma_joinid"]).concat().to_pandas().to_numpy() del census, query, hv, hv_idx gc.collect() diff --git a/tools/models/scvi/scvi-prepare.py b/tools/models/scvi/scvi-prepare.py index 4c2214629..b66c05833 100644 --- a/tools/models/scvi/scvi-prepare.py +++ b/tools/models/scvi/scvi-prepare.py @@ -11,13 +11,14 @@ with open(file) as f: config = yaml.safe_load(f) - census = cellxgene_census.open_soma(census_version="2023-12-15") - census_config = config.get("census") experiment_name = census_config.get("organism") obs_query = census_config.get("obs_query") obs_query_model = census_config.get("obs_query_model") + version = census_config.get("version") + census = cellxgene_census.open_soma(census_version=version) + if obs_query is None: obs_value_filter = obs_query_model else: