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

[python] Bump tiledbsoma version to 1.12.3 #1235

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion api/python/cellxgene_census/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies= [
# NOTE: the tiledbsoma version must be >= to the version used in the Census builder, to
# ensure that the assets are readable (tiledbsoma supports backward compatible reading).
# Make sure this version does not fall behind the builder's tiledbsoma version.
"tiledbsoma~=1.11.4",
"tiledbsoma~=1.12.3",
"anndata",
"numpy>=1.21,<2.0",
"requests",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ def __init__(
experimental
"""
self.exp_uri = experiment.uri
self.aws_region = experiment.context.tiledb_ctx.config().get("vfs.s3.region")
self.aws_region = experiment.context.tiledb_config.get("vfs.s3.region")
self.measurement_name = measurement_name
self.layer_name = X_name
self.obs_query = obs_query
Expand Down
14 changes: 7 additions & 7 deletions api/python/cellxgene_census/tests/test_open.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_open_soma_stable() -> None:
with cellxgene_census.open_soma() as default_census:
assert default_census.uri == census.uri
for k, v in DEFAULT_TILEDB_CONFIGURATION.items():
assert census.context.tiledb_ctx.config()[k] == str(v)
assert census.context.tiledb_config[k] == str(v)


@pytest.fixture(scope="module")
Expand Down Expand Up @@ -68,7 +68,7 @@ def test_open_soma_with_customized_tiledb_config(latest_locator: CensusLocator)
with cellxgene_census.open_soma(uri=latest_locator["uri"], tiledb_config=tiledb_config) as census:
assert census.uri == latest_locator["uri"]
# Verify that user-provided custom config is passed through correctly
assert census.context.tiledb_ctx.config()["soma.init_buffer_bytes"] == soma_init_buffer_bytes
assert census.context.tiledb_config["soma.init_buffer_bytes"] == soma_init_buffer_bytes


@pytest.mark.live_corpus
Expand All @@ -90,7 +90,7 @@ def test_open_soma_with_customized_plain_soma_context(
context = soma.SOMATileDBContext().replace(**cfg)
with cellxgene_census.open_soma(uri=latest_locator["uri"], context=context) as census:
# Verify that the user-provided config settings are set correctly in the TileDB context object.
assert census.context.tiledb_ctx.config()["soma.init_buffer_bytes"] == soma_init_buffer_bytes
assert census.context.tiledb_config["soma.init_buffer_bytes"] == soma_init_buffer_bytes
assert census.context.timestamp_ms == timestamp_ms


Expand All @@ -108,12 +108,12 @@ def test_open_soma_with_customized_default_soma_context(

with cellxgene_census.open_soma(census_version="latest", context=custom_context) as census:
# Verify the non-overriden soma context defaults are set correctly in the TileDB context object.
assert census.context.tiledb_ctx.config()["vfs.s3.no_sign_request"] == "true"
assert census.context.tiledb_ctx.config()["vfs.s3.region"] == latest_locator.get("s3_region")
assert census.context.tiledb_ctx.config()["py.init_buffer_bytes"] == f"{1 * 1024 ** 3}"
assert census.context.tiledb_config["vfs.s3.no_sign_request"] == "true"
assert census.context.tiledb_config["vfs.s3.region"] == latest_locator.get("s3_region")
assert census.context.tiledb_config["py.init_buffer_bytes"] == f"{1 * 1024 ** 3}"

# Verify that the user-overridden config settings are set correctly in the TileDB context object.
assert census.context.tiledb_ctx.config()["soma.init_buffer_bytes"] == soma_init_buffer_bytes
assert census.context.tiledb_config["soma.init_buffer_bytes"] == soma_init_buffer_bytes
assert census.context.timestamp_ms == timestamp_ms


Expand Down
3 changes: 1 addition & 2 deletions tools/cellxgene_census_builder/tests/test_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import psutil
import pyarrow as pa
import pytest
import tiledb
import tiledbsoma as soma

from cellxgene_census_builder.build_soma import build
Expand Down Expand Up @@ -95,7 +94,7 @@ def proxy_psutil_virtual_memory() -> psutil._pslinux.svmem:
# Query the census and do assertions
with soma.Collection.open(
uri=census_build_args.soma_path.as_posix(),
context=soma.options.SOMATileDBContext(tiledb_ctx=tiledb.Ctx({"vfs.s3.region": "us-west-2"})),
context=soma.options.SOMATileDBContext(tiledb_config={"vfs.s3.region": "us-west-2"}),
) as census:
# There are 16 cells in total (4 in each dataset). They all belong to homo_sapiens
human_obs = census[CENSUS_DATA_NAME]["homo_sapiens"]["obs"].read().concat().to_pandas()
Expand Down
12 changes: 5 additions & 7 deletions tools/models/geneformer/generate-geneformer-embeddings.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,11 @@ def main(argv):
except Exception: # noqa: BLE001
pass
tiledbsoma_context = tiledbsoma.options.SOMATileDBContext(
tiledb_ctx=tiledb.Ctx(
{
"py.init_buffer_bytes": 4 * 1024**3,
"soma.init_buffer_bytes": 4 * 1024**3,
"vfs.s3.region": aws_region,
}
)
tiledb_config={
"py.init_buffer_bytes": 4 * 1024**3,
"soma.init_buffer_bytes": 4 * 1024**3,
"vfs.s3.region": aws_region,
}
)

with tiledbsoma.SparseNDArray.open(args.outfile, "r", context=tiledbsoma_context):
Expand Down
2 changes: 1 addition & 1 deletion tools/models/geneformer/wdl/generate_embeddings.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ task init_embeddings_array {
type=pa.float32(),
shape=(2**31-2, ~{embedding_dim}),
context = tiledbsoma.options.SOMATileDBContext(
tiledb_ctx=tiledb.Ctx({"vfs.s3.region": '~{s3_region}'})
tiledb_config={"vfs.s3.region": '~{s3_region}'}
)
).close()
EOF
Expand Down
Loading