Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
lidongze0629 committed Aug 23, 2024
1 parent 343d2f3 commit 331cf00
Show file tree
Hide file tree
Showing 21 changed files with 900 additions and 1,758 deletions.
1 change: 1 addition & 0 deletions V6D_VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.23.0
1 change: 1 addition & 0 deletions python/graphscope/gsctl/V6D_VERSION
74 changes: 17 additions & 57 deletions python/graphscope/gsctl/commands/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,15 @@
from graphscope.gsctl.utils import err
from graphscope.gsctl.utils import info
from graphscope.gsctl.utils import succ

version_file_path = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "..", "VERSION"
)

with open(version_file_path, "r", encoding="utf-8") as fp:
sv = version.parse(fp.read().strip())
__is_prerelease__ = sv.is_prerelease
__version__ = str(sv)

from graphscope.gsctl.version import __v6d_version__
from graphscope.gsctl.version import __version__

# Interactive docker container config
INTERACTIVE_DOCKER_CONTAINER_NAME = "gs-interactive-instance"
INTERACTIVE_DOCKER_CONTAINER_LABEL = "flex=interactive"


scripts_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "scripts")
install_deps_script = os.path.join(scripts_dir, "install_deps_command.sh")
install_deps_script = os.path.join(scripts_dir, "install_deps.sh")
default_graphscope_repo_path = os.path.join(
os.path.dirname(os.path.realpath(__file__)),
"..",
Expand Down Expand Up @@ -349,17 +340,20 @@ def status(type):
@click.argument(
"type",
type=click.Choice(
["dev", "client"],
[
"dev",
"dev-analytical",
"dev-analytical-java",
"dev-interactive",
"dev-learning",
],
case_sensitive=False,
),
required=True,
)
@click.option(
"--graphscope-repo",
envvar="GRAPHSCOPE_REPO",
type=click.Path(),
default=os.path.abspath("."),
show_default=True,
required=False,
help="GraphScope code repo location.",
)
@click.option(
Expand All @@ -373,74 +367,40 @@ def status(type):
type=click.Path(),
default="/opt/graphscope",
show_default=True,
help="Install built binaries to customized location.",
)
@click.option(
"--from-local",
type=click.Path(),
default="/tmp/gs-local-deps",
show_default=True,
help="""Find raw dependencies of GraphScope from a local directory. The raw
dependencies would then be built and installed to [prefix]. If the directory
is empty or not exists, dependency files would be downloaded to [directory].""",
help="Specify the directory on disk to which the file will be installed",
)
@click.option(
"--v6d-version",
default="main",
default=__v6d_version__,
show_default=True,
help="v6d version to clone.",
)
@click.option(
"-j",
"--jobs",
default="2",
help="Concurrent jobs in building, i.e., -j argument passed to make.",
)
@click.option(
"--for-analytical",
is_flag=True,
default=False,
help="Only install analytical engine dependencies.",
help="vineyard version",
)
@click.option(
"--no-v6d",
is_flag=True,
default=False,
help="Do not install v6d, for build base docker images, could only be used with '--for-analytical'",
help="Do not install vineyard, could be used with analytical type",
)
def install_deps(
type,
graphscope_repo,
cn,
install_prefix,
from_local,
v6d_version,
jobs,
for_analytical,
no_v6d,
):
"""Install dependencies for building GraphScope."""
cmd = [
"bash",
"-e",
install_deps_script,
"-t",
type,
"-i",
"--install-prefix",
install_prefix,
"-d",
from_local,
"-v",
"--v6d-version",
str(v6d_version),
"-j",
str(jobs),
]
if for_analytical:
cmd.append("--for-analytical")
if no_v6d:
if not for_analytical:
# could only be used with '--for-analytical'
raise RuntimeError("Missing --for-analytical with --no-v6d parameter")
cmd.append("--no-v6d")
if cn:
cmd.append("--cn")
Expand Down
Empty file.
41 changes: 0 additions & 41 deletions python/graphscope/gsctl/scripts/dev_command.sh

This file was deleted.

103 changes: 0 additions & 103 deletions python/graphscope/gsctl/scripts/format_command.sh

This file was deleted.

23 changes: 0 additions & 23 deletions python/graphscope/gsctl/scripts/initialize.sh

This file was deleted.

Loading

0 comments on commit 331cf00

Please sign in to comment.