Yohann/support-int-types by YohannDudouit · Pull Request #187 · llnl/AMS

YohannDudouit · 2026-03-09T21:07:55Z

Add support for int32_t and int64_t as "scalar" types for AMSTensor.
Also fix an unrelated minor bug in eos_ams, where the density was used twice instead of the energy.

github-actions

Cpp-linter Review

Used clang-format v18.1.8

Click here for the full clang-format patch

diff --git a/src/AMSlib/AMSTensor.cpp b/src/AMSlib/AMSTensor.cpp
index 8362f41..45a41e2 100644
--- a/src/AMSlib/AMSTensor.cpp
+++ b/src/AMSlib/AMSTensor.cpp
@@ -36 +36,2 @@ bool AMSTensor::isContiguous(AMSTensor::IntDimType expected_stride) const
-namespace {
+namespace
+{
@@ -53 +54 @@ constexpr AMSDType scalar_to_ams_dtype()
-}
+}  // namespace
diff --git a/src/AMSlib/wf/interface.cpp b/src/AMSlib/wf/interface.cpp
index b413f26..07a6611 100644
--- a/src/AMSlib/wf/interface.cpp
+++ b/src/AMSlib/wf/interface.cpp
@@ -105 +105,2 @@ static ams::SmallVector<ams::AMSTensor> torchToAMSTensors(
-      throw std::runtime_error("torchToAMSTensors: unsupported tensor scalar type");
+      throw std::runtime_error(
+          "torchToAMSTensors: unsupported tensor scalar type");

Have any feedback or feature suggestions? Share it here.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Signed-off-by: Loic Pottier <[email protected]>

lpottier

LGTM

YohannDudouit · 2026-04-08T22:52:23Z

LGTM

I'm adding tests. Trying to get them in before the meeting :)

lpottier · 2026-04-08T22:53:35Z

@YohannDudouit Okay perfect, no rush. I am using your branch to fix AMS CI (on LLNL side) :)

github-actions

Cpp-linter Review

Used clang-format v18.1.8

Click here for the full clang-format patch

diff --git a/tests/AMSlib/ams_interface/int_interface.cpp b/tests/AMSlib/ams_interface/int_interface.cpp
index b139f67..d2bf795 100644
--- a/tests/AMSlib/ams_interface/int_interface.cpp
+++ b/tests/AMSlib/ams_interface/int_interface.cpp
@@ -20,3 +20 @@ struct AMSGlobalFixture {
-  AMSGlobalFixture() {
-    AMSInit();
-  }
+  AMSGlobalFixture() { AMSInit(); }
@@ -233,2 +231,2 @@ CATCH_TEST_CASE("AMS API: 2D int32_t tensor execution", "[ams][api][int32][2d]")
-    AMSCAbstrModel model = AMSRegisterAbstractModel(
-        "int32_2d_test", 1.0, "", false);
+    AMSCAbstrModel model =
+        AMSRegisterAbstractModel("int32_2d_test", 1.0, "", false);
@@ -309,2 +307,2 @@ CATCH_TEST_CASE("AMS API: Mixed type tensors", "[ams][api][mixed]")
-    AMSCAbstrModel model = AMSRegisterAbstractModel(
-        "mixed_test", 1.0, "", false);
+    AMSCAbstrModel model =
+        AMSRegisterAbstractModel("mixed_test", 1.0, "", false);
diff --git a/tests/AMSlib/wf/int_tensors.cpp b/tests/AMSlib/wf/int_tensors.cpp
index 608d599..3377bce 100644
--- a/tests/AMSlib/wf/int_tensors.cpp
+++ b/tests/AMSlib/wf/int_tensors.cpp
@@ -25 +25,2 @@ CATCH_TEST_CASE("AMSTensor: int32_t tensor creation and basic properties",
-  const auto device = GENERATE(AMSResourceType::AMS_HOST, AMSResourceType::AMS_DEVICE);
+  const auto device =
+      GENERATE(AMSResourceType::AMS_HOST, AMSResourceType::AMS_DEVICE);
@@ -83 +84,2 @@ CATCH_TEST_CASE("AMSTensor: int64_t tensor creation and basic properties",
-  const auto device = GENERATE(AMSResourceType::AMS_HOST, AMSResourceType::AMS_DEVICE);
+  const auto device =
+      GENERATE(AMSResourceType::AMS_HOST, AMSResourceType::AMS_DEVICE);
@@ -118 +120,2 @@ CATCH_TEST_CASE("AMSTensor: int64_t tensor creation and basic properties",
-CATCH_TEST_CASE("AMSTensor: int32_t tensor view operations", "[ams][tensor][int32][view]")
+CATCH_TEST_CASE("AMSTensor: int32_t tensor view operations",
+                "[ams][tensor][int32][view]")
@@ -130 +133,2 @@ CATCH_TEST_CASE("AMSTensor: int32_t tensor view operations", "[ams][tensor][int3
-    auto tensor_view = AMSTensor::view<int32_t>(data.data(), shape, strides, device);
+    auto tensor_view =
+        AMSTensor::view<int32_t>(data.data(), shape, strides, device);
@@ -149 +153,2 @@ CATCH_TEST_CASE("AMSTensor: int32_t tensor view operations", "[ams][tensor][int3
-    auto tensor_view = AMSTensor::view<int32_t>(data.data(), shape, strides, device);
+    auto tensor_view =
+        AMSTensor::view<int32_t>(data.data(), shape, strides, device);
@@ -162 +167,2 @@ CATCH_TEST_CASE("AMSTensor: int32_t tensor view operations", "[ams][tensor][int3
-CATCH_TEST_CASE("AMSTensor: int64_t tensor view operations", "[ams][tensor][int64][view]")
+CATCH_TEST_CASE("AMSTensor: int64_t tensor view operations",
+                "[ams][tensor][int64][view]")
@@ -174 +180,2 @@ CATCH_TEST_CASE("AMSTensor: int64_t tensor view operations", "[ams][tensor][int6
-    auto tensor_view = AMSTensor::view<int64_t>(data.data(), shape, strides, device);
+    auto tensor_view =
+        AMSTensor::view<int64_t>(data.data(), shape, strides, device);
@@ -185 +192,2 @@ CATCH_TEST_CASE("AMSTensor: int64_t tensor view operations", "[ams][tensor][int6
-CATCH_TEST_CASE("AMSTensor: int tensor transpose operations", "[ams][tensor][transpose]")
+CATCH_TEST_CASE("AMSTensor: int tensor transpose operations",
+                "[ams][tensor][transpose]")
@@ -259 +267,2 @@ CATCH_TEST_CASE("AMSTensor: int tensor move semantics", "[ams][tensor][move]")
-CATCH_TEST_CASE("AMSTensor: dtype_to_size utility for int types", "[ams][utils]")
+CATCH_TEST_CASE("AMSTensor: dtype_to_size utility for int types",
+                "[ams][utils]")
@@ -282 +291 @@ CATCH_TEST_CASE("AMSTensor: dtype_to_size utility for int types", "[ams][utils]"
-    CATCH_REQUIRE(size_int32 == size_float);  // Both 4 bytes
+    CATCH_REQUIRE(size_int32 == size_float);   // Both 4 bytes
@@ -288 +297,2 @@ CATCH_TEST_CASE("AMSTensor: dtype_to_size utility for int types", "[ams][utils]"
-CATCH_TEST_CASE("AMSTensor: SmallVector of int tensors", "[ams][tensor][smallvector]")
+CATCH_TEST_CASE("AMSTensor: SmallVector of int tensors",
+                "[ams][tensor][smallvector]")

Have any feedback or feature suggestions? Share it here.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions

Cpp-linter Review

Used clang-format v18.1.8

Click here for the full clang-format patch

diff --git a/tests/AMSlib/ams_interface/int_interface.cpp b/tests/AMSlib/ams_interface/int_interface.cpp
index 7defa67..d2bf795 100644
--- a/tests/AMSlib/ams_interface/int_interface.cpp
+++ b/tests/AMSlib/ams_interface/int_interface.cpp
@@ -231,2 +231,2 @@ CATCH_TEST_CASE("AMS API: 2D int32_t tensor execution", "[ams][api][int32][2d]")
-    AMSCAbstrModel model = AMSRegisterAbstractModel(
-        "int32_2d_test", 1.0, "", false);
+    AMSCAbstrModel model =
+        AMSRegisterAbstractModel("int32_2d_test", 1.0, "", false);
@@ -307,2 +307,2 @@ CATCH_TEST_CASE("AMS API: Mixed type tensors", "[ams][api][mixed]")
-    AMSCAbstrModel model = AMSRegisterAbstractModel(
-        "mixed_test", 1.0, "", false);
+    AMSCAbstrModel model =
+        AMSRegisterAbstractModel("mixed_test", 1.0, "", false);
diff --git a/tests/AMSlib/wf/int_tensors.cpp b/tests/AMSlib/wf/int_tensors.cpp
index 608d599..3377bce 100644
--- a/tests/AMSlib/wf/int_tensors.cpp
+++ b/tests/AMSlib/wf/int_tensors.cpp
@@ -25 +25,2 @@ CATCH_TEST_CASE("AMSTensor: int32_t tensor creation and basic properties",
-  const auto device = GENERATE(AMSResourceType::AMS_HOST, AMSResourceType::AMS_DEVICE);
+  const auto device =
+      GENERATE(AMSResourceType::AMS_HOST, AMSResourceType::AMS_DEVICE);
@@ -83 +84,2 @@ CATCH_TEST_CASE("AMSTensor: int64_t tensor creation and basic properties",
-  const auto device = GENERATE(AMSResourceType::AMS_HOST, AMSResourceType::AMS_DEVICE);
+  const auto device =
+      GENERATE(AMSResourceType::AMS_HOST, AMSResourceType::AMS_DEVICE);
@@ -118 +120,2 @@ CATCH_TEST_CASE("AMSTensor: int64_t tensor creation and basic properties",
-CATCH_TEST_CASE("AMSTensor: int32_t tensor view operations", "[ams][tensor][int32][view]")
+CATCH_TEST_CASE("AMSTensor: int32_t tensor view operations",
+                "[ams][tensor][int32][view]")
@@ -130 +133,2 @@ CATCH_TEST_CASE("AMSTensor: int32_t tensor view operations", "[ams][tensor][int3
-    auto tensor_view = AMSTensor::view<int32_t>(data.data(), shape, strides, device);
+    auto tensor_view =
+        AMSTensor::view<int32_t>(data.data(), shape, strides, device);
@@ -149 +153,2 @@ CATCH_TEST_CASE("AMSTensor: int32_t tensor view operations", "[ams][tensor][int3
-    auto tensor_view = AMSTensor::view<int32_t>(data.data(), shape, strides, device);
+    auto tensor_view =
+        AMSTensor::view<int32_t>(data.data(), shape, strides, device);
@@ -162 +167,2 @@ CATCH_TEST_CASE("AMSTensor: int32_t tensor view operations", "[ams][tensor][int3
-CATCH_TEST_CASE("AMSTensor: int64_t tensor view operations", "[ams][tensor][int64][view]")
+CATCH_TEST_CASE("AMSTensor: int64_t tensor view operations",
+                "[ams][tensor][int64][view]")
@@ -174 +180,2 @@ CATCH_TEST_CASE("AMSTensor: int64_t tensor view operations", "[ams][tensor][int6
-    auto tensor_view = AMSTensor::view<int64_t>(data.data(), shape, strides, device);
+    auto tensor_view =
+        AMSTensor::view<int64_t>(data.data(), shape, strides, device);
@@ -185 +192,2 @@ CATCH_TEST_CASE("AMSTensor: int64_t tensor view operations", "[ams][tensor][int6
-CATCH_TEST_CASE("AMSTensor: int tensor transpose operations", "[ams][tensor][transpose]")
+CATCH_TEST_CASE("AMSTensor: int tensor transpose operations",
+                "[ams][tensor][transpose]")
@@ -259 +267,2 @@ CATCH_TEST_CASE("AMSTensor: int tensor move semantics", "[ams][tensor][move]")
-CATCH_TEST_CASE("AMSTensor: dtype_to_size utility for int types", "[ams][utils]")
+CATCH_TEST_CASE("AMSTensor: dtype_to_size utility for int types",
+                "[ams][utils]")
@@ -282 +291 @@ CATCH_TEST_CASE("AMSTensor: dtype_to_size utility for int types", "[ams][utils]"
-    CATCH_REQUIRE(size_int32 == size_float);  // Both 4 bytes
+    CATCH_REQUIRE(size_int32 == size_float);   // Both 4 bytes
@@ -288 +297,2 @@ CATCH_TEST_CASE("AMSTensor: dtype_to_size utility for int types", "[ams][utils]"
-CATCH_TEST_CASE("AMSTensor: SmallVector of int tensors", "[ams][tensor][smallvector]")
+CATCH_TEST_CASE("AMSTensor: SmallVector of int tensors",
+                "[ams][tensor][smallvector]")

Have any feedback or feature suggestions? Share it here.

…into yohann/support-int-types

YohannDudouit added 2 commits March 2, 2026 14:48

Add support for int32_t and int64_t.

24952fa

Fix typo/bug in AMSEOS.

806d2c8

YohannDudouit temporarily deployed to github-pages March 9, 2026 21:07 — with GitHub Actions Inactive

github-actions Bot reviewed Mar 9, 2026

View reviewed changes

Comment thread src/AMSlib/AMSTensor.cpp Outdated

Comment thread src/AMSlib/AMSTensor.cpp Outdated

Comment thread src/AMSlib/wf/interface.cpp Outdated

Apply suggestions from code review

fbe9fa1

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

YohannDudouit temporarily deployed to github-pages March 9, 2026 21:26 — with GitHub Actions Inactive

Merge branch 'develop' into yohann/support-int-types

45f57ba

lpottier temporarily deployed to github-pages April 3, 2026 18:06 — with GitHub Actions Inactive

Trigger Build

4341d7a

Signed-off-by: Loic Pottier <[email protected]>

lpottier temporarily deployed to github-pages April 3, 2026 19:52 — with GitHub Actions Inactive

Deactivating Dane tests

8f3fb62

Signed-off-by: Loic Pottier <[email protected]>

lpottier temporarily deployed to github-pages April 8, 2026 22:03 — with GitHub Actions Inactive

lpottier self-requested a review April 8, 2026 22:50

lpottier approved these changes Apr 8, 2026

View reviewed changes

Add unit tests for int support.

02abe7a

YohannDudouit temporarily deployed to github-pages April 9, 2026 18:37 — with GitHub Actions Inactive

github-actions Bot reviewed Apr 9, 2026

View reviewed changes

Update tests/AMSlib/ams_interface/int_interface.cpp

8a4c7e0

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

YohannDudouit temporarily deployed to github-pages April 9, 2026 19:40 — with GitHub Actions Inactive

Apply suggestions from code review

6713128

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

YohannDudouit temporarily deployed to github-pages April 9, 2026 19:41 — with GitHub Actions Inactive

github-actions Bot reviewed Apr 9, 2026

View reviewed changes

YohannDudouit added 3 commits April 9, 2026 14:03

Fix _elements used before initialization.

fae7149

Fix HIP memory allocation and typo.

4c7e851

Merge branch 'yohann/support-int-types' of https://github.com/llnl/AMS …

a514b74

…into yohann/support-int-types

YohannDudouit temporarily deployed to github-pages April 9, 2026 21:04 — with GitHub Actions Inactive

lpottier reviewed Apr 10, 2026

View reviewed changes

Comment thread tests/AMSlib/wf/CMakeLists.txt Outdated

lpottier reviewed Apr 10, 2026

View reviewed changes

Comment thread tests/AMSlib/ams_interface/CMakeLists.txt Outdated

Rename tests.

6362d3e

YohannDudouit temporarily deployed to github-pages April 10, 2026 17:54 — with GitHub Actions Inactive

lpottier merged commit e1357a0 into develop Apr 13, 2026
20 checks passed

Conversation

YohannDudouit commented Mar 9, 2026

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-format v18.1.8

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lpottier left a comment

Choose a reason for hiding this comment

Uh oh!

YohannDudouit commented Apr 8, 2026

Uh oh!

lpottier commented Apr 8, 2026

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-format v18.1.8

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-format v18.1.8

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants