Merge pull request #139 from HaliteChallenge/profile-engine

Reduce CPU usage, fix compilation

Author: lidavidm

apiserver/apiserver/login/__init__.py

@@ -70,9 +70,16 @@ def google_login_init():
 @cross_origin(methods=["GET"], origins=config.CORS_ORIGINS, supports_credentials=True)
 def me():
     if config.SESSION_COOKIE in flask.session:
-        return flask.jsonify({
-            "user_id": flask.session[config.SESSION_COOKIE],
-        })
+        with model.read_conn() as conn:
+            user = conn.execute(sqlalchemy.sql.select([
+                model.users.c.id.label("user_id"),
+            ]).where((model.users.c.id == flask.session[config.SESSION_COOKIE]) &
+                     (model.users.c.session_secret == flask.session[config.SESSION_SECRET]))).first()
+
+            if user:
+                return flask.jsonify({
+                    "user_id": flask.session[config.SESSION_COOKIE],
+                })
     else:
         user = util.validate_api_key(
             flask.request.headers.get(config.API_KEY_HEADER))
@@ -195,7 +202,7 @@ def generic_login_callback(email, oauth_provider, oauth_id, default_username=Non
                 flask.session[config.SESSION_SECRET] = session_secret
                 flask.session[config.SESSION_COOKIE] = new_user_id[0]
             except sqlalchemy.exc.IntegrityError:
-                raise util.APIError(400, message="User already exists with this email.")
+                raise util.APIError(400, message="User already exists with this email. If you would like to change your login method, reach out to [email protected] with this token: " + str(oauth_id))
 
             if default_username:
                 # Try to use default username, but give up if taken.

apiserver/worker/compiler.py

@@ -377,6 +377,9 @@ def compile(self, bot_dir, globs, errors, timelimit):
     "Julia": [
         ["JULIA_DEPOT_PATH=\$(pwd) julia -e 'using Pkg; Pkg.activate(\\\".\\\"); Pkg.instantiate()'"],
     ],
+    "Kotlin": [
+        ["kotlinc", "-include-runtime", "-d", BOT + ".jar"],
+    ],
     "Haskell": [
         ["ghc", "--make", BOT + ".hs", "-O", "-v0", "-rtsopts"],
     ],
@@ -568,6 +571,13 @@ def compile(self, bot_dir, globs, errors, timelimit):
             (["*.jl"], ChmodCompiler("Julia")),
         ]
     ),
+    Language("Kotlin", BOT +".jar", "MyBot.kt",
+        "java -Xmx" + str(MEMORY_LIMIT) + "m -cp MyBot.jar MyBot",
+        ["*.class, *.jar"],
+        [
+            (["*.kt"], ExternalCompiler(comp_args["Kotlin"][0])),
+        ]
+    ),
     Language("Lisp", BOT, "MyBot.lisp",
         "./MyBot --dynamic-space-size " + str(MEMORY_LIMIT),
         [BOT],

apiserver/worker/worker.py

@@ -160,6 +160,12 @@ def executeCompileTask(user_id, bot_id, backend):
         try:
             if didCompile:
                 logging.debug("Bot did compile\n")
+
+                # Make things group-readable
+                subprocess.call([
+                    "sudo", "-H", "-u", "bot_compilation", "-s",
+                    "chmod", "-R", "g+r", temp_dir,
+                ], stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL)
                 archive_path = os.path.join(temp_dir, str(user_id)+".zip")
                 archive.zipFolder(temp_dir, archive_path)
                 backend.storeBotRemotely(user_id, bot_id, archive_path)

game_engine/core/HaliteImpl.cpp

@@ -412,30 +412,21 @@ void HaliteImpl::update_inspiration() {
             }
 
             // Explore locations around this ship
-            std::unordered_set<Location> visited_locs{};
-            std::unordered_set<Location> to_visit_locs{location};
-            while (!to_visit_locs.empty()) {
-                const Location cur = *to_visit_locs.begin();
-                visited_locs.emplace(cur);
-                to_visit_locs.erase(to_visit_locs.begin());
-
-                const auto &cur_cell = game.map.at(cur);
-                if (cur_cell.entity != Entity::None) {
+            for (auto dx = -inspiration_radius; dx <= inspiration_radius; dx++) {
+                for (auto dy = -inspiration_radius; dy <= inspiration_radius; dy++) {
+                    const auto cur = Location{
+                        (((location.x + dx) % game.map.width) + game.map.width) % game.map.width,
+                        (((location.y + dy) % game.map.height) + game.map.height) % game.map.height
+                    };
+
+                    const auto &cur_cell = game.map.at(cur);
+                    if (cur_cell.entity == Entity::None ||
+                        game.map.distance(location, cur) > inspiration_radius) {
+                        continue;
+                    }
                     const auto &other_entity = game.store.get_entity(cur_cell.entity);
                     ships_in_radius[other_entity.owner]++;
                 }
-
-                for (const Location &neighbor : game.map.get_neighbors(cur)) {
-                    if((visited_locs.find(neighbor) == visited_locs.end())
-                       && (to_visit_locs.find(neighbor) == to_visit_locs.end())) {
-                        if (game.map.distance(location, neighbor) <= inspiration_radius) {
-                            to_visit_locs.emplace(neighbor);
-                        }
-                        else {
-                            visited_locs.emplace(neighbor);
-                        }
-                    }
-                }
             }
 
             // Total up ships of other player

website/learn-programming-challenge/downloads.md

@@ -99,6 +99,7 @@ Our community creates and shares a wide variety of tools for developing Halite b
 
 * [Reloader Script](https://forums.halite.io/t/halite-3-reloader-script/120) displays the difference a bot's output and a given replay file.
 * [Alternative Local Replay Viewer](https://forums.halite.io/t/fluorine-a-halite-3-replay-viewer/99)
-* [Match Manager](https://gitlab.com/smiley1983/halite3-match-manager)
+* [Match Manager (smiley1983)](https://gitlab.com/smiley1983/halite3-match-manager)
+* [Match Manager (ported from Halite I)](https://github.com/HaliteChallenge/Halite-III/tree/master/tools/manager)
 
 <br/>