Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade library versions #151

Merged
merged 7 commits into from
Mar 5, 2023
Merged

upgrade library versions #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
80874b7
upgrade library versions
yosupo06 Mar 5, 2023
1483039
upgrade python version of expander.yml
yosupo06 Mar 5, 2023
87d5426
add no-implicit-int-float-conversion for suppressing warning from gtest
yosupo06 Mar 5, 2023
b900bb7
upgrade googletest
yosupo06 Mar 5, 2023
b8d5d34
fix workflow of expander.yml
yosupo06 Mar 5, 2023
577fd9e
fix #152: support vs2022 / deprecate vs2017
yosupo06 Mar 5, 2023
797b9f5
minor fix document
yosupo06 Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/expander.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/unittest_msvc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions document_en/appendix.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions document_ja/appendix.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`

となるように配置してください。

Expand Down
2 changes: 1 addition & 1 deletion test/benchmark/benchmark
Open in desktop
Submodule benchmark updated 144 files
2 changes: 1 addition & 1 deletion test/unittest/googletest
Open in desktop
Submodule googletest updated 288 files
3 changes: 2 additions & 1 deletion tools/generate_document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down