Skip to content

Commit

Permalink
fixed issues with optimality
Browse files Browse the repository at this point in the history
  • Loading branch information
speckdavid committed Jan 30, 2024
1 parent 786a8d9 commit 960dc2f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2,710 deletions.
17 changes: 3 additions & 14 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ def get_tag(self):


SYMK_REPO = "https://github.com/speckdavid/symk.git"
# SYMK_RELEASE = 'release-22.12'
SYMK_RELEASE = None
# CHANGESET is ignored if release is not None
SYMK_CHANGESET = "c97ce836a4247c72b33acfffc8f81985c8ff9dac"
SYMK_PATCH_NAME = "osp_patch_file.patch"


def clone_and_compile_symk():
Expand All @@ -42,17 +37,11 @@ def clone_and_compile_symk():
if os.path.exists(symk):
shutil.rmtree(symk)
print(f"Folder '{symk}' deleted.")
if SYMK_RELEASE is not None:
subprocess.run(["git", "clone", "-b", SYMK_RELEASE, SYMK_REPO])
else:
subprocess.run(["git", "clone", SYMK_REPO])
subprocess.run(["git", "clone", SYMK_REPO])

shutil.move("symk", "up_symk/symk")
os.chdir("up_symk/symk")
if SYMK_RELEASE is None:
subprocess.run(["git", "checkout", SYMK_CHANGESET])
print("Applying patch...")
subprocess.run(["git", "apply", os.path.join("..", SYMK_PATCH_NAME)])
subprocess.run(["git", "checkout", "osp"])
print("Building SymK (this can take some time)...")
subprocess.run([sys.executable, "build.py"],
stdout = subprocess.PIPE, stderr = subprocess.PIPE,
Expand Down Expand Up @@ -82,7 +71,7 @@ def run(self):

setup(
name="up_symk",
version="1.1.0",
version="1.2.0",
description="Unified Planning Integration of the SymK planner",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down
Loading

0 comments on commit 960dc2f

Please sign in to comment.