Combining multiple where clauses with const generics into a single one (

#264)
coreylowman · Oct 19, 2022 · 50e81eb · 50e81eb
1 parent f0cbf2f
commit 50e81eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/nn/conv.rs b/src/nn/conv.rs
@@ -69,8 +69,7 @@ impl<
         const W: usize,
     > Module<Tensor3D<I, H, W, T>> for Conv2D<I, O, K, S, P>
 where
-    [(); (W + 2 * P - K) / S + 1]:,
-    [(); (H + 2 * P - K) / S + 1]:,
+    [[[(); (W + 2 * P - K) / S + 1]; (H + 2 * P - K) / S + 1]; O]:,
 {
     type Output = Tensor3D<O, { (H + 2 * P - K) / S + 1 }, { (W + 2 * P - K) / S + 1 }, T>;
 
@@ -92,8 +91,7 @@ impl<
         const W: usize,
     > Module<Tensor4D<B, I, H, W, T>> for Conv2D<I, O, K, S, P>
 where
-    [(); (W + 2 * P - K) / S + 1]:,
-    [(); (H + 2 * P - K) / S + 1]:,
+    [[[[(); (W + 2 * P - K) / S + 1]; (H + 2 * P - K) / S + 1]; O]; B]:,
 {
     type Output = Tensor4D<B, O, { (H + 2 * P - K) / S + 1 }, { (W + 2 * P - K) / S + 1 }, T>;
 

diff --git a/src/nn/pool2d.rs b/src/nn/pool2d.rs
@@ -57,8 +57,7 @@ macro_rules! impl_pools {
                 T: Tape,
             > Module<Tensor3D<C, H, W, T>> for $PoolTy<K, S, P>
         where
-            [(); (W + 2 * P - K) / S + 1]:,
-            [(); (H + 2 * P - K) / S + 1]:,
+            [[(); (W + 2 * P - K) / S + 1]; (H + 2 * P - K) / S + 1]:,
         {
             type Output = Tensor3D<C, { (H + 2 * P - K) / S + 1 }, { (W + 2 * P - K) / S + 1 }, T>;
 
@@ -79,8 +78,7 @@ macro_rules! impl_pools {
                 T: Tape,
             > Module<Tensor4D<B, C, H, W, T>> for $PoolTy<K, S, P>
         where
-            [(); (W + 2 * P - K) / S + 1]:,
-            [(); (H + 2 * P - K) / S + 1]:,
+            [[(); (W + 2 * P - K) / S + 1]; (H + 2 * P - K) / S + 1]:,
         {
             type Output =
                 Tensor4D<B, C, { (H + 2 * P - K) / S + 1 }, { (W + 2 * P - K) / S + 1 }, T>;