浏览代码

Update of pybind11 and progressBar for newer gcc

master
Trevor Irons 1年前
父节点
当前提交
6284dc76cb
共有 4 个文件被更改,包括 6 次插入7 次删除
  1. 1
    1
      CMake/SuperBuild.cmake
  2. 2
    2
      Modules/LemmaCore/include/ProgressBar.h
  3. 2
    3
      Modules/LemmaCore/src/ProgressBar.cpp
  4. 1
    1
      python/setup.py

+ 1
- 1
CMake/SuperBuild.cmake 查看文件

82
 	#find_package(PythonLibs 3.0 REQUIRED)
82
 	#find_package(PythonLibs 3.0 REQUIRED)
83
         ExternalProject_Add(pybind11
83
         ExternalProject_Add(pybind11
84
 		    GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
84
 		    GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
85
-		    GIT_TAG "v2.5.0" # "master" #"v2.4.3" #"master"
85
+		    GIT_TAG "v2.11.1" # "master" #"v2.4.3" #"master"
86
 		    UPDATE_COMMAND ""
86
 		    UPDATE_COMMAND ""
87
 		    PATCH_COMMAND ""
87
 		    PATCH_COMMAND ""
88
     	    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/pybind11
88
     	    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/pybind11

+ 2
- 2
Modules/LemmaCore/include/ProgressBar.h 查看文件

1
 #ifndef PROGRESS_BAR_H
1
 #ifndef PROGRESS_BAR_H
2
 #define PROGRESS_BAR_H
2
 #define PROGRESS_BAR_H
3
 
3
 
4
+#include <stdint.h>
4
 #include <string>
5
 #include <string>
5
 
6
 
6
 /**
7
 /**
16
      * want to monitor and an initial message to be displayed on top of the bar
17
      * want to monitor and an initial message to be displayed on top of the bar
17
      * (which can be updated with updateLastPrintedMessage()).
18
      * (which can be updated with updateLastPrintedMessage()).
18
      */
19
      */
19
-    ProgressBar(
20
-            uint32_t expectedIterations, const std::string& initialMessage="");
20
+    ProgressBar(uint32_t expectedIterations, const std::string& initialMessage="");
21
 
21
 
22
     /**
22
     /**
23
      * Destructor to guarantee RAII.
23
      * Destructor to guarantee RAII.

+ 2
- 3
Modules/LemmaCore/src/ProgressBar.cpp 查看文件

2
 #include <iostream>
2
 #include <iostream>
3
 #include <iomanip>
3
 #include <iomanip>
4
 #include <sstream>
4
 #include <sstream>
5
-#include <algorithm> 
5
+#include <algorithm>
6
 
6
 
7
 #define LENGTH_OF_PROGRESS_BAR 55
7
 #define LENGTH_OF_PROGRESS_BAR 55
8
 #define PERCENTAGE_BIN_SIZE (100.0/LENGTH_OF_PROGRESS_BAR)
8
 #define PERCENTAGE_BIN_SIZE (100.0/LENGTH_OF_PROGRESS_BAR)
27
     }
27
     }
28
 }
28
 }
29
 
29
 
30
-ProgressBar::ProgressBar(
31
-            uint32_t expectedIterations, const std::string& initialMessage)
30
+ProgressBar::ProgressBar(uint32_t expectedIterations, const std::string& initialMessage)
32
     : mTotalIterations(expectedIterations),
31
     : mTotalIterations(expectedIterations),
33
       mNumberOfTicks(0),
32
       mNumberOfTicks(0),
34
       mEnded(false)
33
       mEnded(false)

+ 1
- 1
python/setup.py 查看文件

24
 
24
 
25
 setup(
25
 setup(
26
   name             = 'pyLemma',
26
   name             = 'pyLemma',
27
-  version          = '0.4.0', 
27
+  version          = '0.4.1', 
28
   author           = 'Trevor Irons and others',
28
   author           = 'Trevor Irons and others',
29
   author_email     = 'Trevor.Irons@lemmasoftware.org',
29
   author_email     = 'Trevor.Irons@lemmasoftware.org',
30
   description      = 'PyLemma is a wrapper to Lemma',
30
   description      = 'PyLemma is a wrapper to Lemma',

正在加载...
取消
保存