From 80874b723365e5573ed358e41b1693966d2b4f87 Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Mon, 6 Mar 2023 03:24:34 +0900 Subject: [PATCH 1/7] upgrade library versions --- test/benchmark/benchmark | 2 +- test/unittest/googletest | 2 +- tools/generate_document.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/benchmark/benchmark b/test/benchmark/benchmark index 8df87f6..d572f47 160000 --- a/test/benchmark/benchmark +++ b/test/benchmark/benchmark @@ -1 +1 @@ -Subproject commit 8df87f6c879cbcabd17c5cfcec7b89687df36953 +Subproject commit d572f4777349d43653b21d6c2fc63020ab326db2 diff --git a/test/unittest/googletest b/test/unittest/googletest index 703bd9c..b796f7d 160000 --- a/test/unittest/googletest +++ b/test/unittest/googletest @@ -1 +1 @@ -Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e +Subproject commit b796f7d44681514f58a683a3a71ff17c94edb0c1 diff --git a/tools/generate_document.py b/tools/generate_document.py index 0158a33..d14d486 100755 --- a/tools/generate_document.py +++ b/tools/generate_document.py @@ -8,7 +8,8 @@ import markdown import toml -from jinja2 import DictLoader, Environment, Template, escape +from jinja2 import DictLoader, Environment, Template +from markupsafe import escape logger: Logger = getLogger(__name__) From 1483039370af825e8b954a98519c8ab7b690b957 Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Mon, 6 Mar 2023 03:27:35 +0900 Subject: [PATCH 2/7] upgrade python version of expander.yml --- .github/workflows/expander.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/expander.yml b/.github/workflows/expander.yml index 6faa0f7..aeb85cc 100644 --- a/.github/workflows/expander.yml +++ b/.github/workflows/expander.yml @@ -12,11 +12,11 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.5, 3.6] + python-version: [3.7, 3.8, 3.9, 3.10, 3.11] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Set up pytest From 87d54267e8e57e71f469ae1d76255341e9976ad8 Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Mon, 6 Mar 2023 03:31:49 +0900 Subject: [PATCH 3/7] add no-implicit-int-float-conversion for suppressing warning from gtest --- test/unittest/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt index 692e686..94f2d07 100644 --- a/test/unittest/CMakeLists.txt +++ b/test/unittest/CMakeLists.txt @@ -10,7 +10,8 @@ set(CMAKE_CXX_EXTENSIONS OFF) if(NOT MSVC) message("Not MSVC") - add_compile_options(-Wall -Wextra -Wshadow -Wconversion -Wno-sign-conversion -Werror) + # no-implicit-int-float-conversion: for suppressing warning from gtest + add_compile_options(-Wall -Wextra -Wshadow -Wconversion -Wno-sign-conversion -Wno-implicit-int-float-conversion -Werror) add_compile_options(-fsanitize=undefined,address -fno-sanitize-recover=all) add_link_options(-fsanitize=undefined,address) else() From b900bb70e4e7412a73403d0f6e6b9860e22714f7 Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Mon, 6 Mar 2023 03:36:06 +0900 Subject: [PATCH 4/7] upgrade googletest --- test/unittest/CMakeLists.txt | 3 +-- test/unittest/googletest | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt index 94f2d07..692e686 100644 --- a/test/unittest/CMakeLists.txt +++ b/test/unittest/CMakeLists.txt @@ -10,8 +10,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) if(NOT MSVC) message("Not MSVC") - # no-implicit-int-float-conversion: for suppressing warning from gtest - add_compile_options(-Wall -Wextra -Wshadow -Wconversion -Wno-sign-conversion -Wno-implicit-int-float-conversion -Werror) + add_compile_options(-Wall -Wextra -Wshadow -Wconversion -Wno-sign-conversion -Werror) add_compile_options(-fsanitize=undefined,address -fno-sanitize-recover=all) add_link_options(-fsanitize=undefined,address) else() diff --git a/test/unittest/googletest b/test/unittest/googletest index b796f7d..cead3d5 160000 --- a/test/unittest/googletest +++ b/test/unittest/googletest @@ -1 +1 @@ -Subproject commit b796f7d44681514f58a683a3a71ff17c94edb0c1 +Subproject commit cead3d57c93ff8c4e5c1bbae57a5c0b0b0f6e168 From b8d5d3405216a8127d9bdd6e68db11c92938e1cd Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Mon, 6 Mar 2023 03:36:15 +0900 Subject: [PATCH 5/7] fix workflow of expander.yml --- .github/workflows/expander.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/expander.yml b/.github/workflows/expander.yml index aeb85cc..1f7049c 100644 --- a/.github/workflows/expander.yml +++ b/.github/workflows/expander.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.7, 3.8, 3.9, 3.10, 3.11] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From 577fd9ea83f16990de1875898acc3988a257fc1a Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Mon, 6 Mar 2023 04:55:45 +0900 Subject: [PATCH 6/7] fix #152: support vs2022 / deprecate vs2017 --- .github/workflows/unittest_msvc.yml | 4 +--- document_en/appendix.md | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/unittest_msvc.yml b/.github/workflows/unittest_msvc.yml index 75a7522..896c7a6 100644 --- a/.github/workflows/unittest_msvc.yml +++ b/.github/workflows/unittest_msvc.yml @@ -16,12 +16,10 @@ jobs: msvc: "Visual Studio 17 2022" - os: windows-2019 msvc: "Visual Studio 16 2019" - - os: windows-2016 - msvc: "Visual Studio 15 2017" steps: - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1 - uses: actions/checkout@v2 with: submodules: recursive diff --git a/document_en/appendix.md b/document_en/appendix.md index 810fa33..81ac3a8 100644 --- a/document_en/appendix.md +++ b/document_en/appendix.md @@ -22,16 +22,16 @@ If you don't want to copy `atcoder` folder manually, do as follows. ### Visual Studio -Visual Studio 2017 / 2019 is supported. Update it if you are using old Visual Studio. +Visual Studio 2019 / 2022 is supported. Update it if you are using old Visual Studio. If Visual Studio is installed, there is a folder like the following. +- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include` - `C:\Program Files (x86)\Microsoft Visual Studio\2019\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.27.29110)\include` -- `C:\Program Files (x86)\Microsoft Visual Studio\2017\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.10.25017)\include` Copy `atcoder` folder into it, i.e., put it so that the path will be as follows. -- `C:\Program Files (x86)\Microsoft Visual Studio\2019\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.27.29110)\include\atcoder\dsu.hpp` +- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include\atcoder/dsu.hpp` ## How to Submit to Other Online Judge Systems From 797b9f5d5d87fc45440dd237fe144e5b2507aa1a Mon Sep 17 00:00:00 2001 From: Kohei Morita Date: Mon, 6 Mar 2023 05:08:39 +0900 Subject: [PATCH 7/7] minor fix document --- document_en/appendix.md | 2 +- document_ja/appendix.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/document_en/appendix.md b/document_en/appendix.md index 81ac3a8..f791ab3 100644 --- a/document_en/appendix.md +++ b/document_en/appendix.md @@ -31,7 +31,7 @@ If Visual Studio is installed, there is a folder like the following. Copy `atcoder` folder into it, i.e., put it so that the path will be as follows. -- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include\atcoder/dsu.hpp` +- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include\atcoder\dsu.hpp` ## How to Submit to Other Online Judge Systems diff --git a/document_ja/appendix.md b/document_ja/appendix.md index 37433ee..c21e983 100644 --- a/document_ja/appendix.md +++ b/document_ja/appendix.md @@ -22,16 +22,16 @@ ### Visual Studioへのインストール方法 -古いVisual Studioを使っている場合、アップデートしてください。Visual Studio 2017 / 2019をサポートしています。 +古いVisual Studioを使っている場合、アップデートしてください。Visual Studio 2019 / 2022をサポートしています。 Visual Studioがインストールされているならば、以下のようなフォルダがあるはずです。 +- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include` - `C:\Program Files (x86)\Microsoft Visual Studio\2019\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.27.29110)\include` -- `C:\Program Files (x86)\Microsoft Visual Studio\2017\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.10.25017)\include` このなかに丸ごと `atcoder` フォルダをコピーしてください。つまり、 -- `C:\Program Files (x86)\Microsoft Visual Studio\2019\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.27.29110)\include\atcoder\dsu.hpp` +- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include\atcoder\dsu.hpp` となるように配置してください。