Merge pull request #30 from wx257osn2/add-cpp20

reki2000 · web-flow · commit 09a350dc989f · 2022-08-09T08:17:15.000+09:00
Add unregulated-cpp20
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,30 @@
 [submodule "cpp/external_projects/unordered_dense"]
 	path = cpp/external_projects/unordered_dense
 	url = https://github.com/martinus/unordered_dense
+[submodule "unregulated-cpp20/external_projects/unordered_dense"]
+	path = unregulated-cpp20/external_projects/unordered_dense
+	url = https://github.com/martinus/unordered_dense
+[submodule "unregulated-cpp20/external_projects/fast_io"]
+	path = unregulated-cpp20/external_projects/fast_io
+	url = https://github.com/cppfastio/fast_io
+[submodule "unregulated-cpp20/external_projects/container"]
+	path = unregulated-cpp20/external_projects/container
+	url = https://github.com/boostorg/container
+[submodule "unregulated-cpp20/external_projects/move"]
+	path = unregulated-cpp20/external_projects/move
+	url = https://github.com/boostorg/move
+[submodule "unregulated-cpp20/external_projects/intrusive"]
+	path = unregulated-cpp20/external_projects/intrusive
+	url = https://github.com/boostorg/intrusive
+[submodule "unregulated-cpp20/external_projects/config"]
+	path = unregulated-cpp20/external_projects/config
+	url = https://github.com/boostorg/config
+[submodule "unregulated-cpp20/external_projects/assert"]
+	path = unregulated-cpp20/external_projects/assert
+	url = https://github.com/boostorg/assert
+[submodule "unregulated-cpp20/external_projects/static_assert"]
+	path = unregulated-cpp20/external_projects/static_assert
+	url = https://github.com/boostorg/static_assert
+[submodule "unregulated-cpp20/external_projects/core"]
+	path = unregulated-cpp20/external_projects/core
+	url = https://github.com/boostorg/core
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Simple benchmarks of Dijkstra algorithm among C++, Go, Julia, Python(+Cython +Py
 This benchmark uses [hyperfine](https://github.com/sharkdp/hyperfine). Follow the install instruction there.
 
 
-Submodules are contained. You need to
+For `cpp` and `unregulated-cpp20` , submodules are contained. You need to
 
 ```
 git submodule update --init --recursive
@@ -33,6 +33,7 @@ You need running environments for languages below:
 - Kotlin : 1.7 + jdk >= 18
 - Julia : 1.7
 - Clang : 7 (or versions which support C++17)
+- GCC(g++) : 10 (or versions which support C++20)
 - Dart : 2.16.1
 - Python : 3.10, Cython 0.29, PyPy 3.9-7.3.9
 
@@ -77,7 +78,7 @@ for all languages
 
 for specific language
 ```
-./run.sh [cpp|go|rust|javascript|julia|kotlin|python|cython|pypy|dart]
+./run.sh [cpp|go|rust|javascript|julia|kotlin|python|cython|pypy|dart|unregulated-cpp20]
 ```
 
 for test setup - choose one implementation (ex.`cpp`) to make a 'correct' result.
@@ -89,5 +90,5 @@ mv out/cpp.txt out/expected.txt
 
 for test
 ```
-./test.sh [cpp|go|rust|javascript|julia|kotlin|python|cython|pypy|dart]
+./test.sh [cpp|go|rust|javascript|julia|kotlin|python|cython|pypy|dart|unregulated-cpp20]
 ```
diff --git a/run.sh b/run.sh
@@ -25,7 +25,7 @@ function build {
 if [ -n "$*" ]; then
   langs="$*"
 else
-  langs="cpp go rust javascript julia kotlin python cython pypy dart"
+  langs="cpp go rust javascript julia kotlin python cython pypy dart unregulated-cpp20"
 fi
 
 for lang in $(echo $langs); do
diff --git a/test.sh b/test.sh
@@ -18,7 +18,7 @@ if [ -n "$1" ]; then
     check $lang
   done
 else
-  for lang in cpp go rust javascript julia kotlin python cython pypy dart; do
+  for lang in cpp go rust javascript julia kotlin python cython pypy dart unregulated-cpp20; do
     check $lang
   done
 fi
diff --git a/unregulated-cpp20/.gitignore b/unregulated-cpp20/.gitignore
@@ -0,0 +1 @@
+main
diff --git a/unregulated-cpp20/Makefile b/unregulated-cpp20/Makefile
@@ -0,0 +1,19 @@
+all: main
+
+clean:
+	rm -f main
+
+INCLUDE_BOOST_CONTAINER = \
+	-I external_projects/container/include \
+	-I external_projects/move/include \
+	-I external_projects/intrusive/include \
+	-I external_projects/config/include \
+	-I external_projects/assert/include \
+	-I external_projects/static_assert/include \
+	-I external_projects/core/include \
+	-Wno-stringop-overread
+
+main: src/main.cpp
+	g++ -std=c++20 -O3 -Wall -Wextra -pedantic-errors -march=native -mtune=native -I external_projects/unordered_dense/include -I external_projects/fast_io/include -DFAST_IO_OPTIMIZE_SIZE $(INCLUDE_BOOST_CONTAINER) -o $@ $<
+
+.PHONY: all clean
diff --git a/unregulated-cpp20/bench.sh b/unregulated-cpp20/bench.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./main "$@"
diff --git a/unregulated-cpp20/external_projects/assert b/unregulated-cpp20/external_projects/assert
@@ -0,0 +1 @@
+Subproject commit 7dea14cf7f21dcd5bc5d4cedfd22935878634cdf
diff --git a/unregulated-cpp20/external_projects/config b/unregulated-cpp20/external_projects/config
@@ -0,0 +1 @@
+Subproject commit c35885ced42096c3d8c8f0cda930d533d94acae4
diff --git a/unregulated-cpp20/external_projects/container b/unregulated-cpp20/external_projects/container
@@ -0,0 +1 @@
+Subproject commit 231dd48e70ff830f171e2d2b775ee13855c6a0b9
diff --git a/unregulated-cpp20/external_projects/core b/unregulated-cpp20/external_projects/core
@@ -0,0 +1 @@
+Subproject commit 8503c536dc38da4bda16a2c70e27bfe045b535d4
diff --git a/unregulated-cpp20/external_projects/fast_io b/unregulated-cpp20/external_projects/fast_io
@@ -0,0 +1 @@
+Subproject commit db2a19909cbaa0e5fc5d0034bff36e9681a290a3
diff --git a/unregulated-cpp20/external_projects/intrusive b/unregulated-cpp20/external_projects/intrusive
@@ -0,0 +1 @@
+Subproject commit f439778dc7a851bf3ba8929fd5ecf199b0d13dcd
diff --git a/unregulated-cpp20/external_projects/move b/unregulated-cpp20/external_projects/move
@@ -0,0 +1 @@
+Subproject commit 19bb08cf17cffba726875a906ba0be8fdfa15cd0
diff --git a/unregulated-cpp20/external_projects/static_assert b/unregulated-cpp20/external_projects/static_assert
@@ -0,0 +1 @@
+Subproject commit 45eec41c293bc5cd36ec3ed83671f70bc1aadc9f
diff --git a/unregulated-cpp20/external_projects/unordered_dense b/unregulated-cpp20/external_projects/unordered_dense
@@ -0,0 +1 @@
+Subproject commit e015525696881c4ed074d12402f742bc28ac9d21
diff --git a/unregulated-cpp20/src/main.cpp b/unregulated-cpp20/src/main.cpp
@@ -0,0 +1,174 @@
+#include<vector>
+#include<unordered_map>
+#include<string>
+#include<string_view>
+#include<queue>
+#include<cstdint>
+#include<limits>
+#include"ankerl/unordered_dense.h"
+#include"fast_io.h"
+#include"boost/container/vector.hpp"
+#include"boost/container/small_vector.hpp"
+
+using NodeId = int;
+using NodeIndex = int;
+using Distance = std::int32_t;
+using Edge = std::pair<NodeIndex, Distance>;
+template<typename T> using SmallVector = boost::container::small_vector<T, 4>;
+
+constexpr int DISTANCE_MULTIPLE = 100;
+
+bool is_debug = false;
+
+struct G {
+  ankerl::unordered_dense::map<NodeId,NodeIndex> id2idx;
+  boost::container::vector<NodeId> idx2id = {0};
+  NodeIndex idx = 1;
+  boost::container::vector<SmallVector<Edge>> edge = {SmallVector<Edge>()};
+} g;
+
+inline NodeIndex get_idx(NodeId id) {
+  NodeIndex i = g.id2idx[id];
+  if (i == 0) {
+    i = g.idx++;
+    g.id2idx[id] = i;
+    g.idx2id.push_back(id);
+    g.edge.push_back(SmallVector<Edge>());
+  }
+  return i;
+}
+
+inline void add_edge(NodeId start, NodeId end, Distance distance) {
+  const NodeIndex s = get_idx(start);
+  const NodeIndex e = get_idx(end);
+  g.edge[s].emplace_back(e, distance);
+}
+
+inline int stoi_unchecked(std::string_view s) {
+  int result = 0;
+  for(auto&& x : s) {
+    result *= 10;
+    result += x - '0';
+  }
+  return result;
+}
+
+// 123.4567 --> 12345
+inline int stof100(std::string_view s) {
+  int result = 0;
+  int place = 2;
+  auto it = s.cbegin();
+  const auto end = s.cend();
+  for(; it != end; ++it) {
+    if (*it == '.') {
+      ++it;
+      break;
+    }
+    result *= 10;
+    result += *it - '0';
+  }
+  for(; it != end && place-- > 0; ++it) {
+    result *= 10;
+    result += *it - '0';
+  }
+  while(place-- > 0) {
+    result *= 10;
+  }
+  return result;
+}
+
+void load(auto& output_handle) {
+  auto cst{fast_io::c_stdin()};
+  fast_io::io_lock_guard guard{cst};
+  auto cstd_unlocked{cst.unlocked_handle()};
+
+  std::string line_buf;
+  ::scan(cstd_unlocked, fast_io::manipulators::line_get(line_buf)); // skip header
+
+  while (::scan<true>(cstd_unlocked, fast_io::manipulators::line_get(line_buf))) {
+    std::string_view line(line_buf);
+    while (!fast_io::char_category::is_c_graph(line.back())) [[unlikely]] line.remove_suffix(1); // strip
+    const auto pos1 = line.find(',');
+    const auto pos2 = line.find(',', pos1 + 1);
+    const auto pos3 = line.find(',', pos2 + 1);
+    const auto pos4 = line.find(',', pos3 + 1);
+    const auto pos5 = line.find(',', pos4 + 1);
+    const NodeId s = stoi_unchecked(line.substr(pos2+1, pos3-pos2-1));
+    const NodeId e = stoi_unchecked(line.substr(pos3+1, pos4-pos3-1));
+    const Distance d = stof100(line.substr(pos5+1));
+    if (is_debug) [[unlikely]] ::println(output_handle, "line: ", line, " s: ", s, " e: ", e, " D: ", d);
+    add_edge(s, e, d);
+  }
+}
+
+using Visit = std::pair<Distance, NodeIndex>;
+
+inline std::pair<Distance, boost::container::vector<NodeId>> dijkstra(auto& output_handle, NodeId start, NodeId end) {
+  const NodeIndex s = get_idx(start);
+  const NodeIndex e = get_idx(end);
+
+  const int size = g.idx;
+  boost::container::vector<Distance> d(size, std::numeric_limits<Distance>::max());
+  boost::container::vector<NodeIndex> prev(size);
+
+  std::priority_queue<Visit, boost::container::vector<Visit>, std::greater<>> queue;
+  queue.push({0,s});
+
+  int visited = 0;
+  while (!queue.empty()) {
+    const auto [distance, here] = queue.top();
+    queue.pop();
+    if (distance > d[here]) continue;
+    if (is_debug) [[unlikely]] ::println(output_handle, "visiting: ", here, " distance: ", distance);
+    ++visited;
+
+    for (const Edge& e : g.edge[here]) {
+      const NodeIndex to = e.first;
+      const Distance w = distance + e.second;
+      if (w < d[to]) {
+        prev[to] = here;
+        d[to] = w;
+        queue.push({w, to});
+      }
+    }
+  }
+
+  ::println(output_handle, "visited: ", visited);
+
+  boost::container::vector<NodeId> result;
+  NodeIndex n = e;
+  result.push_back(g.idx2id[n]);
+
+  while (d[n] != std::numeric_limits<Distance>::max() && n != s && n != 0) {
+    n = prev[n];
+    result.push_back(g.idx2id[n]);
+  }
+
+  return {d[e] / DISTANCE_MULTIPLE, result};
+
+}
+
+int main(int argc, char **argv) {
+  const int count = atoi(argv[1]);
+  is_debug = argc > 2 && std::string_view(argv[2]) == "debug";
+
+  auto cst{fast_io::c_stdout()};
+  fast_io::io_lock_guard guard{cst};
+  auto cstd_unlocked{cst.unlocked_handle()};
+
+  load(cstd_unlocked);
+  ::println(cstd_unlocked, "loaded nodes: ", g.idx);
+
+  std::pair<Distance, boost::container::vector<NodeId>> result;
+  for (int i=0; i<count; ++i) {
+    const NodeId s = g.idx2id[(i+1) * 1000];
+    result = dijkstra(cstd_unlocked, s, g.idx2id[1]);
+    ::println(cstd_unlocked, "distance: ", result.first);
+  }
+
+  ::print(cstd_unlocked, "route: ");
+  for (const NodeId id: result.second) {
+    ::print(cstd_unlocked, id, fast_io::manipulators::chvw(' '));
+  }
+  ::print(cstd_unlocked, fast_io::manipulators::chvw('\n'));
+}
