Clean up

Author: DePasqualeOrg

Libraries/MLXVLM/Models/Gemma3n.swift

@@ -1146,18 +1146,18 @@ private class Gemma3Model: Module {
         perLayerInputs: MLXArray? = nil
     ) -> MLXArray {
         var h: MLXArray
-        if let inputsEmbeds = inputsEmbeds {
+        if let inputsEmbeds {
             h = inputsEmbeds
-        } else if let inputs = inputs {
+        } else if let inputs {
             h = embedTokens(inputs)
         } else {
             fatalError("Either inputs or inputsEmbeds must be provided")
         }
 
         let perLayerInputsProcessed: MLXArray
-        if let perLayerInputs = perLayerInputs {
+        if let perLayerInputs {
             perLayerInputsProcessed = perLayerInputs
-        } else if let inputs = inputs {
+        } else if let inputs {
             perLayerInputsProcessed = getPerLayerInputs(inputs)
         } else {
             fatalError("Cannot generate per layer inputs without input ids")
@@ -1213,7 +1213,7 @@ private class Gemma3Model: Module {
                 == "global_attention"
 
             let localMask: MLXFast.ScaledDotProductAttentionMaskMode
-            if let mask = mask {
+            if let mask {
                 localMask = mask
             } else if isGlobal {
                 localMask = fullMask
@@ -1437,9 +1437,9 @@ private class Gemma3nMultimodalEmbedder: Module, UnaryLayer {
         }
 
         let embNorm: MLXArray
-        if let inputsEmbeds = inputsEmbeds {
+        if let inputsEmbeds {
             embNorm = softEmbeddingNorm(inputsEmbeds)
-        } else if let inputIds = inputIds {
+        } else if let inputIds {
             let hardEmb = embedding(inputIds - vocabOffset)
             embNorm = hardEmbeddingNorm(hardEmb)
         } else {
@@ -1490,7 +1490,7 @@ private func gemma3nAttentionWithCacheUpdate(
     // Update cache and get cached keys/values (matches Python's cache.update_and_fetch)
     let (cachedKeys, cachedValues): (MLXArray, MLXArray)
 
-    if let cache = cache {
+    if let cache {
         (cachedKeys, cachedValues) = cache.update(keys: keys, values: values)
     } else {
         (cachedKeys, cachedValues) = (keys, values)
@@ -1792,7 +1792,7 @@ public class Gemma3n: Module, VLMModel, KVCacheDimensionProvider {
         }
 
         // Process audio features
-        if let inputFeatures = inputFeatures, let inputFeaturesMask = inputFeaturesMask {
+        if let inputFeatures, let inputFeaturesMask = inputFeaturesMask {
             let (audioFeatures, audioMask) = getAudioFeatures(inputFeatures, .!inputFeaturesMask)
             let audioPaddingIds = MLXArray([config.vocabSize - 1]).expandedDimensions(axis: 0)
             let audioPaddingEmbs = embedAudio.callAsFunction(audioPaddingIds, inputsEmbeds: nil)
@@ -1862,7 +1862,7 @@ public class Gemma3n: Module, VLMModel, KVCacheDimensionProvider {
     ) -> MLXArray {
         let specialModalityMask: MLXArray
 
-        if let inputIds = inputIds {
+        if let inputIds {
             specialModalityMask = expandedDimensions(inputIds .== tokenId, axis: -1)
         } else {
             // When inputIds is nil, create mask by comparing embeddings
@@ -2211,7 +2211,7 @@ private class Gemma3nCumulativeGroupNorm: Module {
         let expectedInputSuffix = featureDims + [numChannels]
         assert(Array(x.shape.suffix(expectedInputSuffix.count)) == expectedInputSuffix)
 
-        if let mask = mask {
+        if let mask {
             assert(mask.shape == Array(x.shape.prefix(2)))
             assert(mask.dtype == .bool)
         }
@@ -2221,7 +2221,7 @@ private class Gemma3nCumulativeGroupNorm: Module {
         let xCalc = x.asType(calcDtype)
 
         let maskCalc: MLXArray
-        if let mask = mask {
+        if let mask {
             let maskSuffixShape = Array(repeating: 1, count: expectedInputSuffix.count)
             maskCalc = mask.reshaped(Array(mask.shape) + maskSuffixShape).asType(calcDtype)
         } else {
@@ -2848,7 +2848,7 @@ private func rmsNorm2d(
     let vMean = mean(v, axis: 1, keepDims: true)
     var result = x * rsqrt(vMean + eps)
 
-    if let weight = weight {
+    if let weight {
         let weightReshaped = weight.reshaped([1, -1, 1, 1])
         result = result.asType(dtype) * weightReshaped
     }
@@ -3061,7 +3061,7 @@ private class UniversalInvertedResidual: Module, UnaryLayer {
         )
 
         // Layer Scale
-        if let layerScaleInitValue = layerScaleInitValue {
+        if let layerScaleInitValue {
             self._layerScale.wrappedValue = LayerScale2d(
                 dim: outChannels, initValues: layerScaleInitValue)
         } else {
@@ -3420,7 +3420,7 @@ private class MobileAttention: Module, UnaryLayer {
         }
 
         // Layer scaling
-        if let layerScaleInitValue = layerScaleInitValue {
+        if let layerScaleInitValue {
             self._layerScale.wrappedValue = LayerScale2d(
                 dim: outChannels, initValues: layerScaleInitValue)
         } else {