Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies = [
"numpy>=1.26",
"pyzmq>=25.0",
"psutil>=5.9.5",
"httpx",
"httpx[socks]>=0.26.0",
"aiohttp",
"uvicorn",
"uvloop",
Expand Down
12 changes: 0 additions & 12 deletions scripts/check.sh

This file was deleted.

56 changes: 0 additions & 56 deletions scripts/join.sh

This file was deleted.

55 changes: 0 additions & 55 deletions scripts/start.sh

This file was deleted.

10 changes: 4 additions & 6 deletions src/backend/server/scheduler_manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@

from backend.server.constants import NODE_STATUS_AVAILABLE, NODE_STATUS_WAITING
from backend.server.rpc_connection_handler import RPCConnectionHandler
from backend.server.static_config import (
PUBLIC_RELAY_SERVERS,
get_model_info,
get_node_join_command,
)
from backend.server.static_config import get_model_info, get_node_join_command
from common.static_config import PUBLIC_INITIAL_PEERS, PUBLIC_RELAY_SERVERS
from parallax.p2p.server import TransformerConnectionHandler
from parallax_utils.logging_config import get_logger
from scheduling.node import RequestSignal
Expand Down Expand Up @@ -58,8 +55,9 @@ def run(self, model_name, init_nodes_num, is_local_network=True):
f"SchedulerManage starting: model_name={model_name}, init_nodes_num={init_nodes_num}"
)
self.is_local_network = is_local_network
if not is_local_network and not self.relay_servers:
if not is_local_network and not self.initial_peers and not self.relay_servers:
logger.debug("Using public relay servers")
self.initial_peers = PUBLIC_INITIAL_PEERS
self.relay_servers = PUBLIC_RELAY_SERVERS

self._start_scheduler(model_name, init_nodes_num)
Expand Down
5 changes: 0 additions & 5 deletions src/backend/server/static_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@

NODE_JOIN_COMMAND_PUBLIC_NETWORK = """parallax join -s {scheduler_addr} """

PUBLIC_RELAY_SERVERS = [
"/dns4/relay-lattica.gradient.network/udp/18080/quic-v1/p2p/12D3KooWDaqDAsFupYvffBDxjHHuWmEAJE4sMDCXiuZiB8aG8rjf",
"/dns4/relay-lattica.gradient.network/tcp/18080/p2p/12D3KooWDaqDAsFupYvffBDxjHHuWmEAJE4sMDCXiuZiB8aG8rjf",
]


def get_model_info(model_name):
config_path = hf_hub_download(repo_id=model_name, filename="config.json")
Expand Down
18 changes: 18 additions & 0 deletions src/common/static_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
PUBLIC_INITIAL_PEERS = [
"/dns4/bootstrap-lattica.gradient.network/udp/18080/quic-v1/p2p/12D3KooWJHXvu8TWkFn6hmSwaxdCLy4ZzFwr4u5mvF9Fe2rMmFXb",
"/dns4/bootstrap-lattica.gradient.network/tcp/18080/p2p/12D3KooWJHXvu8TWkFn6hmSwaxdCLy4ZzFwr4u5mvF9Fe2rMmFXb",
]

PUBLIC_RELAY_SERVERS = [
"/dns4/relay-lattica.gradient.network/udp/18080/quic-v1/p2p/12D3KooWDaqDAsFupYvffBDxjHHuWmEAJE4sMDCXiuZiB8aG8rjf",
"/dns4/relay-lattica.gradient.network/tcp/18080/p2p/12D3KooWDaqDAsFupYvffBDxjHHuWmEAJE4sMDCXiuZiB8aG8rjf",
]


def get_relay_params():
return [
"--relay-servers",
*PUBLIC_RELAY_SERVERS,
"--initial-peers",
*PUBLIC_INITIAL_PEERS,
]
12 changes: 1 addition & 11 deletions src/parallax/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import sys
from pathlib import Path

from common.static_config import get_relay_params
from parallax_utils.logging_config import get_logger

logger = get_logger("parallax.cli")
Expand Down Expand Up @@ -41,17 +42,6 @@ def get_project_root():
return Path.cwd()


def get_relay_params():
return [
"--relay-servers",
"/dns4/relay-lattica.gradient.network/udp/18080/quic-v1/p2p/12D3KooWDaqDAsFupYvffBDxjHHuWmEAJE4sMDCXiuZiB8aG8rjf",
"/dns4/relay-lattica.gradient.network/tcp/18080/p2p/12D3KooWDaqDAsFupYvffBDxjHHuWmEAJE4sMDCXiuZiB8aG8rjf",
"--initial-peers",
"/dns4/bootstrap-lattica.gradient.network/udp/18080/quic-v1/p2p/12D3KooWJHXvu8TWkFn6hmSwaxdCLy4ZzFwr4u5mvF9Fe2rMmFXb",
"/dns4/bootstrap-lattica.gradient.network/tcp/18080/p2p/12D3KooWJHXvu8TWkFn6hmSwaxdCLy4ZzFwr4u5mvF9Fe2rMmFXb",
]


def run_command(args):
"""Run the scheduler (equivalent to scripts/start.sh)."""
check_python_version()
Expand Down