Skip to content

Commit 2444639

Browse files
dkeeneydkeeney
authored
Merge pull request #978 from htm-community/dep_upd
bumped versions of dependencies
2 parents e04b993 + ef4af8f commit 2444639

File tree

12 files changed

+49
-28
lines changed

12 files changed

+49
-28
lines changed

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -423,16 +423,16 @@ distribution packages as listed and rename them as indicated. Copy these to
423423

424424
| Name to give it | Where to obtain it |
425425
| :--------------------- | :----------------- |
426-
| libyaml.zip (*note1) | https://github.com/yaml/libyaml/archive/acd6f6f014c25e46363e718381e0b35205df2d83.zip |
426+
| libyaml.zip (*note1) | https://github.com/yaml/libyaml/archive/refs/tags/0.2.5.tar.gz |
427427
| boost.tar.gz (*note3) | https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz |
428-
| googletest.tar.gz | https://github.com/google/googletest/archive/release-1.10.0.tar.gz |
429-
| eigen.tar.bz2 | https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.bz2 |
428+
| googletest.tar.gz | https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz |
429+
| eigen.tar.bz2 | https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz |
430430
| mnist.zip (*note4) | https://github.com/wichtounet/mnist/archive/3b65c35ede53b687376c4302eeb44fdf76e0129b.zip |
431-
| pybind11.tar.gz | https://github.com/pybind/pybind11/archive/v2.6.2.tar.gz |
432-
| cereal.tar.gz | https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz |
433-
| sqlite3.tar.gz | https://www.sqlite.org/2021/sqlite-autoconf-3340100.tar.gz |
431+
| pybind11.tar.gz | https://github.com/pybind/pybind11/archive/refs/tags/v2.6.2.tar.gz |
432+
| cereal.tar.gz | https://github.com/USCiLab/cereal/archive/refs/tags/v1.3.2.tar.gz |
433+
| sqlite3.tar.gz | https://www.sqlite.org/2022/sqlite-autoconf-3380200.tar.gz |
434434
| digestpp.zip | https://github.com/kerukuro/digestpp/archive/34ff2eeae397ed744d972d86b5a20f603b029fbd.zip |
435-
| cpp-httplib.zip(*note4)| https://github.com/yhirose/cpp-httplib/archive/v0.8.4.zip |
435+
| cpp-httplib.zip(*note4)| https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.10.4.zip |
436436

437437
* note1: Version 0.2.2 of libyaml is broken so use the master for the repository.
438438
* note3: Boost is not required for any compiler that supports C++17 with `std::filesystem` (MSVC2017, gcc-8, clang-9).

‎bindings/py/cpp_src/bindings/engine/py_Engine.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ namespace htm_ext
395395
.value("BINARY", SerializableFormat::BINARY)
396396
.value("PORTABLE", SerializableFormat::PORTABLE)
397397
.value("JSON", SerializableFormat::JSON)
398-
.value("XML", ::SerializableFormat::XML)
398+
.value("XML", SerializableFormat::XML)
399399
.export_values();
400400
// NOTE: Registered python regions will be serialized in BINARY (i.e. pickle) regardless of the format specified.
401401

‎external/README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ integrated into the cmake-based build of htm.core. The code that does this are
77

88
- Boost.cmake - If needed, finds the boost installation 1.69.0. Boost needs to be built with -fPIC so cannot use externally installed.
99
- digestpp.cmake - Download/install digestpp @ 36fa6ca : Hash digest lib (header only)
10-
- eigen.cmake - Downloads eigen 3.3.7 (header only)
11-
- gtest.cmake - Downloads and installs googletest 1.8.1
10+
- eigen.cmake - Downloads eigen 3.4.0 (header only)
11+
- gtest.cmake - Downloads and installs googletest 1.11.0
1212
- mnist_data.cmake - Downloads the mnist data set from repository master.
13-
- pybind11.cmake - Downloads and installs pybind11 2.2.4 (header only)
14-
- libayml.cmake - Downloads and installs libyaml which is an alternative to yaml-cpp (default)
15-
- cpp-httplib.cmake- Downloads and installs cpp-httplib a REST server (header only)
13+
- pybind11.cmake - Downloads and installs pybind11 2.6.2 (header only)
14+
- libayml.cmake - Downloads and installs libyaml 0.2.5 which is an alternative to yaml-cpp (default)
15+
- cpp-httplib.cmake- Downloads and installs cpp-httplib 0.10.4, a REST server (header only)
16+
- cerial.cmake - Downloads and installs cerial 1.3.2, a serialization package (header only)
1617

1718
External packages included within this repository are built into the common library:
1819

‎external/cereal.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -----------------------------------------------------------------------------
22
# HTM Community Edition of NuPIC
33
# Copyright (C) 2016, Numenta, Inc.
4+
# modified 4/4/2022 - newer version of cerial
45
#
56
# This program is free software: you can redistribute it and/or modify
67
# it under the terms of the GNU Affero Public License version 3 as
@@ -20,8 +21,7 @@
2021
if(EXISTS "${REPOSITORY_DIR}/build/ThirdParty/share/cereal.tar.gz")
2122
set(URL "${REPOSITORY_DIR}/build/ThirdParty/share/cereal.tar.gz")
2223
else()
23-
#set(URL https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz)
24-
set(URL https://github.com/USCiLab/cereal/archive/64f50dbd5cecdaba785217e2b0aeea3a4f1cdfab.zip)
24+
set(URL https://github.com/USCiLab/cereal/archive/refs/tags/v1.3.2.tar.gz)
2525
endif()
2626

2727
message(STATUS "obtaining Cereal")

‎external/cpp-httplib.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -----------------------------------------------------------------------------
22
# HTM Community Edition of NuPIC
33
# Copyright (C) 2020, Numenta, Inc.
4+
# modified 4/4/2022 - newer version
45
#
56
# author: David Keeney, [email protected], Feb 2020
67
#
@@ -24,7 +25,7 @@
2425
if(EXISTS "${REPOSITORY_DIR}/build/ThirdParty/share/cpp-httplib.zip")
2526
set(URL "${REPOSITORY_DIR}/build/ThirdParty/share/cpp-httplib.zip")
2627
else()
27-
set(URL https://github.com/yhirose/cpp-httplib/archive/v0.8.4.zip)
28+
set(URL https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.10.4.zip)
2829
endif()
2930

3031
message(STATUS "obtaining cpp-httplib")

‎external/eigen.cmake‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -----------------------------------------------------------------------------
22
# HTM Community Edition of NuPIC
33
# Copyright (C) 2016, Numenta, Inc.
4+
# modified 4/4/2022 - newer version
45
#
56
# This program is free software: you can redistribute it and/or modify
67
# it under the terms of the GNU Affero Public License version 3 as
@@ -17,10 +18,10 @@
1718

1819
# Fetch Eigen from GitHub archive
1920
#
20-
if(EXISTS "${REPOSITORY_DIR}/build/ThirdParty/share/eigen.tar.bz2")
21-
set(URL "${REPOSITORY_DIR}/build/ThirdParty/share/eigen.tar.bz2")
21+
if(EXISTS "${REPOSITORY_DIR}/build/ThirdParty/share/eigen.tar.gz")
22+
set(URL "${REPOSITORY_DIR}/build/ThirdParty/share/eigen.tar.gz")
2223
else()
23-
set(URL "https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.bz2")
24+
set(URL "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz")
2425
endif()
2526

2627
message(STATUS "obtaining Eigen")

‎external/gtest.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -----------------------------------------------------------------------------
22
# HTM Community Edition of NuPIC
33
# Copyright (C) 2021, Numenta, Inc.
4+
# modified 4/4/2022 - newer version
45
#
56
# This program is free software: you can redistribute it and/or modify
67
# it under the terms of the GNU Affero Public License version 3 as
@@ -34,7 +35,7 @@
3435
if(EXISTS "${REPOSITORY_DIR}/build/ThirdParty/share/googletest.tar.gz")
3536
set(URL "${REPOSITORY_DIR}/build/ThirdParty/share/googletest.tar.gz")
3637
else()
37-
set(URL https://github.com/google/googletest/archive/release-1.10.0.tar.gz)
38+
set(URL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz)
3839
endif()
3940

4041
#

‎external/libYaml.cmake‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# -----------------------------------------------------------------------------
22
# Numenta Platform for Intelligent Computing (NuPIC)
3-
# Copyright (C) 2019, Numenta, Inc. Unless you have purchased from
3+
# Copyright (C) 2019, Numenta, Inc.
4+
# modified 4/4/2022 - newer version
5+
#
6+
# Unless you have purchased from
47
# Numenta, Inc. a separate commercial license for this software code, the
58
# following terms and conditions apply:
69
#
@@ -37,8 +40,7 @@ if(EXISTS ${REPOSITORY_DIR}/build/ThirdParty/share/libyaml.zip)
3740
elif(EXISTS ${REPOSITORY_DIR}/build/ThirdParty/share/libyaml.tar.gz)
3841
set(URL ${REPOSITORY_DIR}/build/ThirdParty/share/libyaml.tar.gz)
3942
else()
40-
set(URL "https://github.com/yaml/libyaml/archive/acd6f6f014c25e46363e718381e0b35205df2d83.zip")
41-
#set(URL "http://pyyaml.org/download/libyaml/yaml-0.2.2.tar.gz")
43+
set(URL "https://github.com/yaml/libyaml/archive/refs/tags/0.2.5.tar.gz")
4244
endif()
4345

4446
message(STATUS "Obtaining libyaml")

‎external/pybind11.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -----------------------------------------------------------------------------
22
# HTM Community Edition of NuPIC
33
# Copyright (C) 2016, Numenta, Inc.
4+
# modified 4/4/2022 - newer version
45
#
56
# This program is free software: you can redistribute it and/or modify
67
# it under the terms of the GNU Affero Public License version 3 as
@@ -21,6 +22,8 @@ if(EXISTS "${REPOSITORY_DIR}/build/ThirdParty/share/pybind11.tar.gz")
2122
set(URL "${REPOSITORY_DIR}/build/ThirdParty/share/pybind11.tar.gz")
2223
else()
2324
set(URL https://github.com/pybind/pybind11/archive/v2.6.2.tar.gz)
25+
# set(URL "https://github.com/pybind/pybind11/archive/refs/tags/v2.9.2.tar.gz")
26+
# This caused an error regarding Base64 someplace inside pickle load. Reverting to 2.6.2
2427
endif()
2528

2629
message(STATUS "obtaining PyBind11")

‎external/sqlite3.cmake‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# -----------------------------------------------------------------------------
22
# Numenta Platform for Intelligent Computing (NuPIC)
3-
# Copyright (C) 2019, Numenta, Inc. Unless you have purchased from
3+
# Copyright (C) 2019, Numenta, Inc.
4+
# modified 4/4/2022 - newer version
5+
#
6+
# Unless you have purchased from
47
# Numenta, Inc. a separate commercial license for this software code, the
58
# following terms and conditions apply:
69
#
@@ -31,7 +34,7 @@
3134
if(EXISTS ${REPOSITORY_DIR}/build/ThirdParty/share/sqlite3.tar.gz)
3235
set(URL ${REPOSITORY_DIR}/build/ThirdParty/share/sqlite3.tar.gz)
3336
else()
34-
set(URL "https://www.sqlite.org/2021/sqlite-autoconf-3340100.tar.gz")
37+
set(URL "https://www.sqlite.org/2022/sqlite-autoconf-3380200.tar.gz")
3538
endif()
3639

3740
message(STATUS "Obtaining sqlite3")

0 commit comments

Comments
 (0)