瀏覽代碼

fix compilation issues on Wheezy

Summary:
see errors here :

 - https://circleci.com/gh/facebookresearch/fastText/1241?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link
 - https://circleci.com/gh/facebookresearch/fastText/1242?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link

Reviewed By: EdouardGrave

Differential Revision: D14185058

fbshipit-source-id: 9d8e608344e0e7cab368fccf86371fadf6e16b09
Onur Çelebi 7 年之前
父節點
當前提交
51e6738d73
共有 4 個文件被更改,包括 8 次插入7 次删除
  1. 1 1
      src/densematrix.h
  2. 5 5
      src/loss.h
  3. 1 0
      src/quantmatrix.cc
  4. 1 1
      src/quantmatrix.h

+ 1 - 1
src/densematrix.h

@@ -32,7 +32,7 @@ class DenseMatrix : public Matrix {
   DenseMatrix(DenseMatrix&&) noexcept;
   DenseMatrix& operator=(const DenseMatrix&) = delete;
   DenseMatrix& operator=(DenseMatrix&&) = delete;
-  virtual ~DenseMatrix() = default;
+  virtual ~DenseMatrix() noexcept override = default;
 
   inline real* data() {
     return data_.data();

+ 5 - 5
src/loss.h

@@ -66,14 +66,14 @@ class BinaryLogisticLoss : public Loss {
 
  public:
   explicit BinaryLogisticLoss(std::shared_ptr<Matrix>& wo);
-  virtual ~BinaryLogisticLoss() override = default;
+  virtual ~BinaryLogisticLoss() noexcept override = default;
   void computeOutput(Model::State& state) const override;
 };
 
 class OneVsAllLoss : public BinaryLogisticLoss {
  public:
   explicit OneVsAllLoss(std::shared_ptr<Matrix>& wo);
-  ~OneVsAllLoss() = default;
+  ~OneVsAllLoss() noexcept override = default;
   real forward(
       const std::vector<int32_t>& targets,
       int32_t targetIndex,
@@ -96,7 +96,7 @@ class NegativeSamplingLoss : public BinaryLogisticLoss {
       std::shared_ptr<Matrix>& wo,
       int neg,
       const std::vector<int64_t>& targetCounts);
-  ~NegativeSamplingLoss() override = default;
+  ~NegativeSamplingLoss() noexcept override = default;
 
   real forward(
       const std::vector<int32_t>& targets,
@@ -133,7 +133,7 @@ class HierarchicalSoftmaxLoss : public BinaryLogisticLoss {
   explicit HierarchicalSoftmaxLoss(
       std::shared_ptr<Matrix>& wo,
       const std::vector<int64_t>& counts);
-  ~HierarchicalSoftmaxLoss() override = default;
+  ~HierarchicalSoftmaxLoss() noexcept override = default;
   real forward(
       const std::vector<int32_t>& targets,
       int32_t targetIndex,
@@ -150,7 +150,7 @@ class HierarchicalSoftmaxLoss : public BinaryLogisticLoss {
 class SoftmaxLoss : public Loss {
  public:
   explicit SoftmaxLoss(std::shared_ptr<Matrix>& wo);
-  ~SoftmaxLoss() override = default;
+  ~SoftmaxLoss() noexcept override = default;
   real forward(
       const std::vector<int32_t>& targets,
       int32_t targetIndex,

+ 1 - 0
src/quantmatrix.cc

@@ -10,6 +10,7 @@
 
 #include <assert.h>
 #include <iostream>
+#include <stdexcept>
 
 namespace fasttext {
 

+ 1 - 1
src/quantmatrix.h

@@ -43,7 +43,7 @@ class QuantMatrix : public Matrix {
   QuantMatrix(QuantMatrix&&) = delete;
   QuantMatrix& operator=(const QuantMatrix&) = delete;
   QuantMatrix& operator=(QuantMatrix&&) = delete;
-  virtual ~QuantMatrix() = default;
+  virtual ~QuantMatrix() noexcept override = default;
 
   void quantizeNorm(const Vector&);
   void quantize(DenseMatrix&& mat);