Update to latest Mountpoint client crates (#212)

* Update to latest Mountpoint client crates Signed-off-by: James Bornholt <[email protected]> * Pin numpy version Signed-off-by: James Bornholt <[email protected]> * Appease clippy Signed-off-by: James Bornholt <[email protected]> --------- Signed-off-by: James Bornholt <[email protected]>
awslabs · Jun 28, 2024 · 3ec7f02 · 3ec7f02
1 parent 91b36e9
commit 3ec7f02
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/s3torchconnector/pyproject.toml b/s3torchconnector/pyproject.toml
@@ -22,8 +22,7 @@ classifiers = [
 ]
 
 dependencies = [
-    #TODO: Remove torch != 2.3.0 restriction when https://github.com/pytorch/data/issues/1244 is fixed
-    "torch >= 2.0.1, != 2.3.0",
+    "torch >= 2.0.1",
     "s3torchconnectorclient >= 1.2.3",
 ]
 
@@ -42,7 +41,7 @@ e2e = [
     "torchvision",
     "Pillow",
     "boto3",
-    "numpy",
+    "numpy < 2",
     "pytest-xdist"
 ]
 

diff --git a/s3torchconnectorclient/Cargo.lock b/s3torchconnectorclient/Cargo.lock
diff --git a/s3torchconnectorclient/Cargo.toml b/s3torchconnectorclient/Cargo.toml
@@ -19,8 +19,8 @@ built = "0.7"
 pyo3 = { version = "0.19.2" }
 pyo3-log = "0.8.3"
 futures = "0.3.28"
-mountpoint-s3-client = { version = "0.8.1", features = ["mock"] }
-mountpoint-s3-crt = "0.7.0"
+mountpoint-s3-client = { version = "0.9.0", features = ["mock"] }
+mountpoint-s3-crt = "0.8.0"
 log = "0.4.20"
 tracing = { version = "0.1.40", default-features = false, features = ["std", "log"] }
 tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"]}

diff --git a/s3torchconnectorclient/rust/src/mock_client.rs b/s3torchconnectorclient/rust/src/mock_client.rs
@@ -43,7 +43,7 @@ impl PyMockClient {
         unsigned: bool,
     ) -> PyMockClient {
         let unordered_list_seed: Option<u64> = None;
-        let config = MockClientConfig { bucket, part_size, unordered_list_seed };
+        let config = MockClientConfig { bucket, part_size, unordered_list_seed, ..Default::default() };
         let mock_client = Arc::new(MockClient::new(config));
 
         PyMockClient {

diff --git a/s3torchconnectorclient/rust/src/mountpoint_s3_client.rs b/s3torchconnectorclient/rust/src/mountpoint_s3_client.rs
@@ -163,7 +163,7 @@ impl MountpointS3Client {
 
 #[allow(clippy::too_many_arguments)]
 impl MountpointS3Client {
-    pub(crate) fn new<Client: ObjectClient>(
+    pub(crate) fn new<Client>(
         region: String,
         user_agent_prefix: String,
         throughput_target_gbps: f64,
@@ -175,8 +175,8 @@ impl MountpointS3Client {
         endpoint: Option<String>,
     ) -> Self
     where
-        Client: Sync + Send + 'static,
-        <Client as ObjectClient>::GetObjectResult: Unpin + Sync,
+        Client: ObjectClient + Sync + Send + 'static,
+        <Client as ObjectClient>::GetObjectRequest: Unpin + Sync,
         <Client as ObjectClient>::PutObjectRequest: Sync,
     {
         Self {

diff --git a/s3torchconnectorclient/rust/src/mountpoint_s3_client_inner.rs b/s3torchconnectorclient/rust/src/mountpoint_s3_client_inner.rs
@@ -57,7 +57,7 @@ impl<T: ObjectClient> MountpointS3ClientInnerImpl<T> {
 impl<Client> MountpointS3ClientInner for MountpointS3ClientInnerImpl<Client>
 where
     Client: ObjectClient,
-    <Client as ObjectClient>::GetObjectResult: Sync + Send + Unpin + 'static,
+    <Client as ObjectClient>::GetObjectRequest: Sync + Unpin + 'static,
     <Client as ObjectClient>::PutObjectRequest: Sync + 'static,
 {
     fn get_object(&self, py: Python, bucket: String, key: String) -> PyResult<GetObjectStream> {