remove nn::functional

Signed-off-by: Ceng23333 <441651826@qq.com>

Author: Ceng23333

include/infinicore/nn/functional.hpp

@@ -1287,141 +1287,6 @@ TestResult NNModuleTest::testModuleRoPE() {
     });
 }
 
-// Test 7.75: SwiGLU module test
-TestResult NNModuleTest::testModuleSwiGLU() {
-    return measureTime("ModuleSwiGLU", [this]() {
-        try {
-            spdlog::info("==========================================");
-            spdlog::info("Testing SwiGLU module implementation");
-            spdlog::info("==========================================");
-
-            // Test 1: Basic SwiGLU creation
-            spdlog::info("Test 1: Basic SwiGLU creation");
-            infinicore::nn::SwiGLU swiglu1;
-
-            auto state1 = swiglu1.state_dict();
-            if (state1.size() != 0) {
-                spdlog::error("SwiGLU should have no parameters, got {}", state1.size());
-                return false;
-            }
-
-            spdlog::debug("Basic SwiGLU creation passed");
-
-            // Test 2: Forward pass - 2D input [batch, hidden]
-            spdlog::info("Test 2: Forward pass with 2D input [batch, hidden]");
-            auto up_2d = infinicore::Tensor::ones({4, 128}, infinicore::DataType::F32, infinicore::Device());
-            auto gate_2d = infinicore::Tensor::ones({4, 128}, infinicore::DataType::F32, infinicore::Device());
-            auto output_2d = swiglu1.forward(up_2d, gate_2d);
-
-            if (output_2d->shape() != std::vector<size_t>({4, 128})) {
-                spdlog::error("2D output shape mismatch. Expected {{4, 128}}");
-                return false;
-            }
-
-            spdlog::debug("2D forward pass passed. Output shape: {{4, 128}}");
-
-            // Test 3: Forward pass - 3D input [batch, seq_len, hidden]
-            spdlog::info("Test 3: Forward pass with 3D input [batch, seq_len, hidden]");
-            auto up_3d = infinicore::Tensor::ones({2, 10, 128}, infinicore::DataType::F32, infinicore::Device());
-            auto gate_3d = infinicore::Tensor::ones({2, 10, 128}, infinicore::DataType::F32, infinicore::Device());
-            auto output_3d = swiglu1.forward(up_3d, gate_3d);
-
-            if (output_3d->shape() != std::vector<size_t>({2, 10, 128})) {
-                spdlog::error("3D output shape mismatch. Expected {{2, 10, 128}}");
-                return false;
-            }
-
-            spdlog::debug("3D forward pass passed. Output shape: {{2, 10, 128}}");
-
-            // Test 4: Different tensor values
-            spdlog::info("Test 4: Testing with different tensor values");
-            auto up_test = infinicore::Tensor::ones({2, 64}, infinicore::DataType::F32, infinicore::Device());
-            auto gate_test = infinicore::Tensor::zeros({2, 64}, infinicore::DataType::F32, infinicore::Device());
-            auto output_test = swiglu1.forward(up_test, gate_test);
-
-            if (output_test->shape() != up_test->shape()) {
-                spdlog::error("Output shape doesn't match input shape");
-                return false;
-            }
-
-            spdlog::debug("Different tensor values test passed");
-
-            // Test 5: Shape mismatch validation (op layer handles this)
-            spdlog::info("Test 5: Testing shape mismatch validation");
-            auto up_shape = infinicore::Tensor::ones({4, 128}, infinicore::DataType::F32, infinicore::Device());
-            auto gate_shape = infinicore::Tensor::ones({4, 64}, infinicore::DataType::F32, infinicore::Device());
-
-            try {
-                swiglu1.forward(up_shape, gate_shape);
-                spdlog::error("Should have thrown exception for shape mismatch");
-                return false;
-            } catch (const std::exception &e) {
-                spdlog::debug("Correctly caught exception for shape mismatch (handled by op layer): {}", e.what());
-            } catch (...) {
-                spdlog::error("Caught unexpected exception type");
-                return false;
-            }
-
-            spdlog::debug("Shape mismatch validation test passed");
-
-            // Test 6: Dtype mismatch validation (op layer handles this)
-            spdlog::info("Test 6: Testing dtype mismatch validation");
-            auto up_dtype = infinicore::Tensor::ones({4, 128}, infinicore::DataType::F32, infinicore::Device());
-            auto gate_dtype = infinicore::Tensor::ones({4, 128}, infinicore::DataType::F16, infinicore::Device());
-
-            try {
-                swiglu1.forward(up_dtype, gate_dtype);
-            } catch (...) {
-                spdlog::error("Caught unexpected exception type");
-                return false;
-            }
-
-            spdlog::debug("Dtype mismatch validation test passed");
-
-            // Test 7: extra_repr
-            spdlog::info("Test 7: Testing extra_repr");
-            std::string repr = swiglu1.extra_repr();
-            spdlog::debug("SwiGLU repr: {}", repr);
-
-            if (repr.find("SwiGLU") == std::string::npos) {
-                spdlog::error("extra_repr should contain SwiGLU");
-                return false;
-            }
-
-            spdlog::debug("extra_repr test passed");
-
-            // Test 8: Different hidden sizes
-            spdlog::info("Test 8: Testing different hidden sizes");
-            auto up_small = infinicore::Tensor::ones({2, 64}, infinicore::DataType::F32, infinicore::Device());
-            auto gate_small = infinicore::Tensor::ones({2, 64}, infinicore::DataType::F32, infinicore::Device());
-            auto output_small = swiglu1.forward(up_small, gate_small);
-
-            auto up_large = infinicore::Tensor::ones({2, 4096}, infinicore::DataType::F32, infinicore::Device());
-            auto gate_large = infinicore::Tensor::ones({2, 4096}, infinicore::DataType::F32, infinicore::Device());
-            auto output_large = swiglu1.forward(up_large, gate_large);
-
-            if (output_small->shape() != std::vector<size_t>({2, 64})) {
-                spdlog::error("Small SwiGLU output shape mismatch");
-                return false;
-            }
-
-            if (output_large->shape() != std::vector<size_t>({2, 4096})) {
-                spdlog::error("Large SwiGLU output shape mismatch");
-                return false;
-            }
-
-            spdlog::debug("Different hidden sizes test passed");
-
-            spdlog::info("All SwiGLU module tests passed!");
-            return true;
-
-        } catch (const std::exception &e) {
-            spdlog::error("Exception in testModuleSwiGLU: {}", e.what());
-            return false;
-        }
-    });
-}
-
 // Test 8: Dtype assertion test
 TestResult NNModuleTest::testDtypeAssertion() {
     return measureTime("DtypeAssertionTest", [this]() {
@@ -1851,7 +1716,6 @@ TestResult NNModuleTest::run() {
     results.push_back(testModuleEmbedding());       // Embedding module test
     results.push_back(testModuleRMSNorm());         // RMSNorm module test
     results.push_back(testModuleRoPE());            // RoPE module test
-    results.push_back(testModuleSwiGLU());          // SwiGLU module test
     results.push_back(testDtypeAssertion());        // Dtype assertion test
     results.push_back(testTinyLlamaConstruction()); // Comprehensive: TinyLlama model test
 

include/infinicore/nn/swiglu.hpp

@@ -7,7 +7,6 @@
 #include "infinicore/nn/parameter.hpp"
 #include "infinicore/nn/rmsnorm.hpp"
 #include "infinicore/nn/rope.hpp"
-#include "infinicore/nn/swiglu.hpp"
 #include "test_runner.h"
 #include <algorithm>
 #include <cmath>
@@ -85,7 +84,6 @@ class NNModuleTest : public TestFramework {
     TestResult testModuleEmbedding();       // Embedding module test
     TestResult testModuleRMSNorm();         // RMSNorm module test
     TestResult testModuleRoPE();            // RoPE module test
-    TestResult testModuleSwiGLU();          // SwiGLU module test
     TestResult testDtypeAssertion();        // Test dtype assertions when loading parameters
     TestResult testTinyLlamaConstruction(); // Comprehensive: construction + weight loading + validation
 };