apply iwyu changes

csukuangfj · Apr 13, 2024 · cfcc7de · cfcc7de
1 parent b50c436
commit cfcc7de
Show file tree

Hide file tree

Showing 27 changed files with 83 additions and 5 deletions.
diff --git a/kaldi-native-fbank/csrc/feature-fbank.cc b/kaldi-native-fbank/csrc/feature-fbank.cc
@@ -24,8 +24,11 @@
 #include <cmath>
 #include <limits>
 #include <vector>
+#include <ostream>
+#include <utility>
 
 #include "kaldi-native-fbank/csrc/feature-functions.h"
+#include "kaldi-native-fbank/csrc/log.h"
 
 namespace knf {
 

diff --git a/kaldi-native-fbank/csrc/feature-fbank.h b/kaldi-native-fbank/csrc/feature-fbank.h
@@ -21,9 +21,11 @@
 #ifndef KALDI_NATIVE_FBANK_CSRC_FEATURE_FBANK_H_
 #define KALDI_NATIVE_FBANK_CSRC_FEATURE_FBANK_H_
 
+#include <stdint.h>
 #include <map>
 #include <string>
 #include <vector>
+#include <sstream>
 
 #include "kaldi-native-fbank/csrc/feature-window.h"
 #include "kaldi-native-fbank/csrc/mel-computations.h"

diff --git a/kaldi-native-fbank/csrc/feature-window.cc b/kaldi-native-fbank/csrc/feature-window.cc
@@ -6,6 +6,7 @@
 
 #include "kaldi-native-fbank/csrc/feature-window.h"
 
+#include <stddef.h>
 #include <algorithm>
 #include <cmath>
 #include <limits>

diff --git a/kaldi-native-fbank/csrc/feature-window.h b/kaldi-native-fbank/csrc/feature-window.h
@@ -7,6 +7,7 @@
 #ifndef KALDI_NATIVE_FBANK_CSRC_FEATURE_WINDOW_H_
 #define KALDI_NATIVE_FBANK_CSRC_FEATURE_WINDOW_H_
 
+#include <stdint.h>
 #include <sstream>
 #include <string>
 #include <vector>

diff --git a/kaldi-native-fbank/csrc/mel-computations.cc b/kaldi-native-fbank/csrc/mel-computations.cc
@@ -20,11 +20,13 @@
 
 #include "kaldi-native-fbank/csrc/mel-computations.h"
 
+#include <stdio.h>
 #include <algorithm>
 #include <sstream>
 #include <vector>
 
 #include "kaldi-native-fbank/csrc/feature-window.h"
+#include "kaldi-native-fbank/csrc/log.h"
 
 namespace knf {
 

diff --git a/kaldi-native-fbank/csrc/mel-computations.h b/kaldi-native-fbank/csrc/mel-computations.h
@@ -19,14 +19,17 @@
 #ifndef KALDI_NATIVE_FBANK_CSRC_MEL_COMPUTATIONS_H_
 #define KALDI_NATIVE_FBANK_CSRC_MEL_COMPUTATIONS_H_
 
+#include <stdint.h>
 #include <cmath>
 #include <string>
 #include <utility>
 #include <vector>
+#include <sstream>
 
 #include "kaldi-native-fbank/csrc/feature-window.h"
 
 namespace knf {
+struct FrameExtractionOptions;
 
 struct MelBanksOptions {
   int32_t num_bins = 25;  // e.g. 25; number of triangular bins

diff --git a/kaldi-native-fbank/csrc/online-feature.cc b/kaldi-native-fbank/csrc/online-feature.cc
@@ -21,6 +21,7 @@
 
 #include "kaldi-native-fbank/csrc/online-feature.h"
 
+#include <stddef.h>
 #include <algorithm>
 #include <utility>
 #include <vector>

diff --git a/kaldi-native-fbank/csrc/online-feature.h b/kaldi-native-fbank/csrc/online-feature.h
@@ -27,6 +27,7 @@
 
 #include "kaldi-native-fbank/csrc/feature-fbank.h"
 #include "kaldi-native-fbank/csrc/whisper-feature.h"
+#include "kaldi-native-fbank/csrc/feature-window.h"
 
 namespace knf {
 

diff --git a/kaldi-native-fbank/csrc/rfft.h b/kaldi-native-fbank/csrc/rfft.h
@@ -19,6 +19,7 @@
 #ifndef KALDI_NATIVE_FBANK_CSRC_RFFT_H_
 #define KALDI_NATIVE_FBANK_CSRC_RFFT_H_
 
+#include <stdint.h>
 #include <memory>
 
 namespace knf {
@@ -48,6 +49,7 @@ class Rfft {
 
  private:
   class RfftImpl;
+
   std::unique_ptr<RfftImpl> impl_;
 };
 

diff --git a/kaldi-native-fbank/csrc/test-log.cc b/kaldi-native-fbank/csrc/test-log.cc
@@ -16,9 +16,6 @@
  * limitations under the License.
  */
 
-#include "gtest/gtest.h"
-#include "kaldi-native-fbank/csrc/log.h"
-
 namespace knf {
 
 #if KNF_ENABLE_CHECK

diff --git a/kaldi-native-fbank/csrc/test-online-fbank.cc b/kaldi-native-fbank/csrc/test-online-fbank.cc
@@ -16,9 +16,15 @@
  * limitations under the License.
  */
 
+#include <stdint.h>
 #include <iostream>
+#include <sstream>
+#include <string>
 
 #include "kaldi-native-fbank/csrc/online-feature.h"
+#include "kaldi-native-fbank/csrc/feature-fbank.h"
+#include "kaldi-native-fbank/csrc/feature-window.h"
+#include "kaldi-native-fbank/csrc/mel-computations.h"
 
 int main() {
   knf::FbankOptions opts;

diff --git a/kaldi-native-fbank/csrc/test-rfft.cc b/kaldi-native-fbank/csrc/test-rfft.cc
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+#include <stdint.h>
+#include <vector>
+
 #include "gtest/gtest.h"
 #include "kaldi-native-fbank/csrc/rfft.h"
 

diff --git a/kaldi-native-fbank/csrc/whisper-feature.cc b/kaldi-native-fbank/csrc/whisper-feature.cc
@@ -20,8 +20,10 @@
 
 #include <cmath>
 #include <vector>
+#include <string>
 
 #include "kaldi-native-fbank/csrc/mel-computations.h"
+#include "kaldi-native-fbank/csrc/log.h"
 
 #ifndef M_2PI
 #define M_2PI 6.283185307179586476925286766559005

diff --git a/kaldi-native-fbank/csrc/whisper-feature.h b/kaldi-native-fbank/csrc/whisper-feature.h
@@ -19,6 +19,7 @@
 #ifndef KALDI_NATIVE_FBANK_CSRC_WHISPER_FEATURE_H_
 #define KALDI_NATIVE_FBANK_CSRC_WHISPER_FEATURE_H_
 
+#include <stdint.h>
 #include <memory>
 #include <vector>
 

diff --git a/kaldi-native-fbank/python/csrc/feature-fbank.cc b/kaldi-native-fbank/python/csrc/feature-fbank.cc
@@ -18,11 +18,18 @@
 
 #include "kaldi-native-fbank/python/csrc/feature-fbank.h"
 
-#include <memory>
+#include <abstract.h>
+#include <floatobject.h>
+#include <longobject.h>
+#include <pybind11/detail/descr.h>
+#include <pybind11/pytypes.h>
+#include <pyerrors.h>
 #include <string>
 
 #include "kaldi-native-fbank/csrc/feature-fbank.h"
 #include "kaldi-native-fbank/python/csrc/utils.h"
+#include "kaldi-native-fbank/csrc/feature-window.h"
+#include "kaldi-native-fbank/csrc/mel-computations.h"
 
 namespace knf {
 

diff --git a/kaldi-native-fbank/python/csrc/feature-fbank.h b/kaldi-native-fbank/python/csrc/feature-fbank.h
@@ -19,6 +19,8 @@
 #ifndef KALDI_NATIVE_FBANK_PYTHON_CSRC_FEATURE_FBANK_H_
 #define KALDI_NATIVE_FBANK_PYTHON_CSRC_FEATURE_FBANK_H_
 
+#include <pybind11/pybind11.h>
+
 #include "kaldi-native-fbank/python/csrc/kaldi-native-fbank.h"
 
 namespace knf {

diff --git a/kaldi-native-fbank/python/csrc/feature-window.cc b/kaldi-native-fbank/python/csrc/feature-window.cc
@@ -18,6 +18,13 @@
 
 #include "kaldi-native-fbank/python/csrc/feature-window.h"
 
+#include <abstract.h>
+#include <floatobject.h>
+#include <longobject.h>
+#include <pybind11/cast.h>
+#include <pybind11/detail/descr.h>
+#include <pybind11/pytypes.h>
+#include <pyerrors.h>
 #include <string>
 #include <vector>
 

diff --git a/kaldi-native-fbank/python/csrc/feature-window.h b/kaldi-native-fbank/python/csrc/feature-window.h
@@ -19,6 +19,8 @@
 #ifndef KALDI_NATIVE_FBANK_PYTHON_CSRC_FEATURE_WINDOW_H_
 #define KALDI_NATIVE_FBANK_PYTHON_CSRC_FEATURE_WINDOW_H_
 
+#include <pybind11/pybind11.h>
+
 #include "kaldi-native-fbank/python/csrc/kaldi-native-fbank.h"
 
 namespace knf {

diff --git a/kaldi-native-fbank/python/csrc/kaldi-native-fbank.cc b/kaldi-native-fbank/python/csrc/kaldi-native-fbank.cc
@@ -18,6 +18,9 @@
 
 #include "kaldi-native-fbank/python/csrc/kaldi-native-fbank.h"
 
+#include <pybind11/pybind11.h>
+#include <pybind11/pytypes.h>
+
 #include "kaldi-native-fbank/python/csrc/feature-fbank.h"
 #include "kaldi-native-fbank/python/csrc/feature-window.h"
 #include "kaldi-native-fbank/python/csrc/mel-computations.h"

diff --git a/kaldi-native-fbank/python/csrc/kaldi-native-fbank.h b/kaldi-native-fbank/python/csrc/kaldi-native-fbank.h
@@ -19,9 +19,12 @@
 #ifndef KALDI_NATIVE_FBANK_PYTHON_CSRC_KALDI_NATIVE_FBANK_H_
 #define KALDI_NATIVE_FBANK_PYTHON_CSRC_KALDI_NATIVE_FBANK_H_
 
+#include <pybind11/detail/common.h>
+
 #include "pybind11/numpy.h"
 #include "pybind11/pybind11.h"
 #include "pybind11/stl.h"
+
 namespace py = pybind11;
 
 #endif  // KALDI_NATIVE_FBANK_PYTHON_CSRC_KALDI_NATIVE_FBANK_H_
diff --git a/kaldi-native-fbank/python/csrc/mel-computations.cc b/kaldi-native-fbank/python/csrc/mel-computations.cc
@@ -18,6 +18,12 @@
 
 #include "kaldi-native-fbank/python/csrc/mel-computations.h"
 
+#include <abstract.h>
+#include <floatobject.h>
+#include <longobject.h>
+#include <pybind11/detail/descr.h>
+#include <pybind11/pytypes.h>
+#include <pyerrors.h>
 #include <string>
 
 #include "kaldi-native-fbank/csrc/mel-computations.h"

diff --git a/kaldi-native-fbank/python/csrc/mel-computations.h b/kaldi-native-fbank/python/csrc/mel-computations.h
@@ -19,6 +19,8 @@
 #ifndef KALDI_NATIVE_FBANK_PYTHON_CSRC_MEL_COMPUTATIONS_H_
 #define KALDI_NATIVE_FBANK_PYTHON_CSRC_MEL_COMPUTATIONS_H_
 
+#include <pybind11/pybind11.h>
+
 #include "kaldi-native-fbank/python/csrc/kaldi-native-fbank.h"
 
 namespace knf {

diff --git a/kaldi-native-fbank/python/csrc/online-feature.cc b/kaldi-native-fbank/python/csrc/online-feature.cc
@@ -18,10 +18,23 @@
 
 #include "kaldi-native-fbank/python/csrc/online-feature.h"
 
+#include <pybind11/attr.h>
+#include <pybind11/cast.h>
+#include <pybind11/detail/descr.h>
+#include <pybind11/numpy.h>
+#include <pybind11/pytypes.h>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
 #include "kaldi-native-fbank/csrc/online-feature.h"
+#include "kaldi-native-fbank/csrc/feature-fbank.h"
+#include "kaldi-native-fbank/csrc/whisper-feature.h"
+
+namespace pybind11 {
+class gil_scoped_release;
+}  // namespace pybind11
+
 namespace knf {
 
 template <typename C>

diff --git a/kaldi-native-fbank/python/csrc/online-feature.h b/kaldi-native-fbank/python/csrc/online-feature.h
@@ -19,6 +19,8 @@
 #ifndef KALDI_NATIVE_FBANK_PYTHON_CSRC_ONLINE_FEATURE_H_
 #define KALDI_NATIVE_FBANK_PYTHON_CSRC_ONLINE_FEATURE_H_
 
+#include <pybind11/pybind11.h>
+
 #include "kaldi-native-fbank/python/csrc/kaldi-native-fbank.h"
 
 namespace knf {

diff --git a/kaldi-native-fbank/python/csrc/rfft.cc b/kaldi-native-fbank/python/csrc/rfft.cc
@@ -18,7 +18,9 @@
 
 #include "kaldi-native-fbank/python/csrc/rfft.h"
 
-#include <string>
+#include <pybind11/cast.h>
+#include <pybind11/detail/descr.h>
+#include <stdint.h>
 #include <vector>
 
 #include "kaldi-native-fbank/csrc/rfft.h"

diff --git a/kaldi-native-fbank/python/csrc/rfft.h b/kaldi-native-fbank/python/csrc/rfft.h
@@ -19,6 +19,8 @@
 #ifndef KALDI_NATIVE_FBANK_PYTHON_CSRC_RFFT_H_
 #define KALDI_NATIVE_FBANK_PYTHON_CSRC_RFFT_H_
 
+#include <pybind11/pybind11.h>
+
 #include "kaldi-native-fbank/python/csrc/kaldi-native-fbank.h"
 
 namespace knf {

diff --git a/kaldi-native-fbank/python/csrc/utils.h b/kaldi-native-fbank/python/csrc/utils.h
@@ -19,6 +19,8 @@
 #ifndef KALDI_NATIVE_FBANK_PYTHON_CSRC_UTILS_H_
 #define KALDI_NATIVE_FBANK_PYTHON_CSRC_UTILS_H_
 
+#include <pybind11/pytypes.h>
+
 #include "kaldi-native-fbank/csrc/feature-fbank.h"
 #include "kaldi-native-fbank/csrc/feature-window.h"
 #include "kaldi-native-fbank/csrc/mel-computations.h"