Merge pull request #406 from macrocosm-os/staging

Staging

Author: Sarkosos

folding/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.3.2"
+__version__ = "2.3.3"
 version_split = __version__.split(".")
 __spec_version__ = (
     (10000 * int(version_split[0]))

folding/base/miner.py

@@ -5,7 +5,6 @@
 import bittensor as bt
 
 from folding.base.neuron import BaseNeuron
-from folding.protocol import PingSynapse
 from folding.utils.config import add_miner_args
 from folding.utils.logger import logger
 
@@ -45,8 +44,6 @@ def __init__(self, config=None):
             forward_fn=self.forward,
             blacklist_fn=self.blacklist,
             priority_fn=self.priority,
-        ).attach(
-            forward_fn=self.ping_forward,  # not sure if we need blacklist on this.
         )
         logger.info(f"Axon created: {self.axon}")
 
@@ -56,23 +53,6 @@ def __init__(self, config=None):
         self.thread: threading.Thread = None
         self.lock = asyncio.Lock()
 
-    def ping_forward(self, synapse: PingSynapse):
-        """Respond to the validator with the necessary information about serving
-
-        Args:
-            self (PingSynapse): must attach "can_serve" and "available_compute"
-        """
-
-        logger.info(f"Received ping request from {synapse.dendrite.hotkey[:8]}")
-
-        synapse.available_compute = self.max_workers - len(self.simulations)
-
-        # TODO: add more conditions.
-        if synapse.available_compute > 0:
-            synapse.can_serve = True
-            logger.success("Telling validator you can serve ✅")
-        return synapse
-
     def run(self):
         pass
 

folding/utils/config.py

@@ -309,12 +309,6 @@ def add_validator_args(cls, parser):
         help="The timeout for each forward call. (seconds)",
         default=45,
     )
-    parser.add_argument(
-        "--neuron.ping_timeout",
-        type=float,
-        help="Controls the timeout for the PingSynapse call",
-        default=45,
-    )
 
     parser.add_argument(
         "--neuron.update_interval",

folding/validators/forward.py

@@ -10,7 +10,7 @@
 from folding.validators.protein import Protein
 from folding.utils.logging import log_event
 from folding.validators.reward import get_energies
-from folding.protocol import PingSynapse, JobSubmissionSynapse
+from folding.protocol import JobSubmissionSynapse
 import asyncio
 from folding.utils.openmm_forcefields import FORCEFIELD_REGISTRY
 from folding.validators.hyperparameters import HyperParameters
@@ -26,28 +26,6 @@
 ROOT_DIR = Path(__file__).resolve().parents[2]
 
 
-async def run_ping_step(self, uids: List[int], timeout: float) -> Dict:
-    """Report a dictionary of ping information from all miners that were
-    randomly sampled for this batch.
-    """
-    axons = [self.metagraph.axons[uid] for uid in uids]
-    synapse = PingSynapse()
-
-    logger.info(f"Pinging {len(axons)} uids")
-    responses: List[PingSynapse] = await self.dendrite.forward(
-        axons=axons,
-        synapse=synapse,
-        timeout=timeout,
-    )
-
-    ping_report = defaultdict(list)
-    for resp in responses:
-        ping_report["miner_status"].append(resp.can_serve)
-        ping_report["reported_compute"].append(resp.available_compute)
-
-    return ping_report
-
-
 async def run_step(
     self,
     protein: Protein,
@@ -69,7 +47,11 @@ async def run_step(
 
     # Get all uids on the network that are NOT validators.
     # the .is_serving flag means that the uid does not have an axon address.
-    uids = get_all_miner_uids(self.metagraph, self.config.neuron.vpermit_tao_limit, include_serving_in_check=False)
+    uids = get_all_miner_uids(
+        self.metagraph,
+        self.config.neuron.vpermit_tao_limit,
+        include_serving_in_check=False,
+    )
 
     # Get the list of uids to query for this step.
     axons = [self.metagraph.axons[uid] for uid in uids]

neurons/validator.py

@@ -34,7 +34,7 @@
     upload_to_s3,
     DigitalOceanS3Handler,
 )
-from folding.validators.forward import create_new_challenge, run_ping_step, run_step
+from folding.validators.forward import create_new_challenge, run_step
 from folding.validators.protein import Protein
 from folding.registries.miner_registry import MinerRegistry
 from folding.organic.api import start_organic_api
@@ -52,7 +52,11 @@ def __init__(self, config=None):
 
         # Sample all the uids on the network, and return only the uids that are non-valis.
         logger.info("Determining all miner uids...⏳")
-        self.all_miner_uids: List = get_all_miner_uids(metagraph=self.metagraph, vpermit_tao_limit=self.config.neuron.vpermit_tao_limit)
+        self.all_miner_uids: List = get_all_miner_uids(
+            metagraph=self.metagraph,
+            vpermit_tao_limit=self.config.neuron.vpermit_tao_limit,
+            include_serving_in_check=False,
+        )
 
         # If we do not have any miner registry saved to the machine, create.
         if not hasattr(self, "miner_registry"):
@@ -79,24 +83,6 @@ def __init__(self, config=None):
             except ValueError as e:
                 raise f"Failed to create S3 handler, check your .env file: {e}"
 
-    def get_uids(self, hotkeys: List[str]) -> List[int]:
-        """Returns the uids corresponding to the hotkeys.
-        It is possible that some hotkeys have been dereg'd,
-        so we need to check for them in the metagraph.
-
-        Args:
-            hotkeys (List[str]): List of hotkeys
-
-        Returns:
-            List[int]: List of uids
-        """
-        return [
-            self.metagraph.hotkeys.index(hotkey)
-            for hotkey in hotkeys
-            if hotkey in self.metagraph.hotkeys
-            and self.metagraph.axons[self.metagraph.hotkeys.index(hotkey)].is_serving
-        ]
-
     async def forward(self, job: Job) -> dict:
         """Carries out a query to the miners to check their progress on a given job (pdb) and updates the job status based on the results.
 
@@ -123,32 +109,6 @@ async def forward(self, job: Job) -> dict:
             job_type=job.job_type,
         )
 
-    async def ping_all_miners(
-        self,
-        exclude_uids: List[int],
-    ) -> Tuple[List[int], List[int]]:
-        """Sample ALL (non-excluded) miner uids and return the list of uids
-        that can serve jobs.
-
-        Args:
-            exclude_uids (List[int]): uids to exclude from the uids search
-
-        Returns:
-           Tuple(List,List): Lists of active and inactive uids
-        """
-
-        current_miner_uids = list(
-            set(self.all_miner_uids).difference(set(exclude_uids))
-        )
-
-        ping_report = await run_ping_step(
-            self, uids=current_miner_uids, timeout=self.config.neuron.ping_timeout
-        )
-        can_serve = ping_report["miner_status"]  # list of booleans
-
-        active_uids = np.array(current_miner_uids)[can_serve].tolist()
-        return active_uids
-
     async def add_job(self, job_event: dict[str, Any], protein: Protein = None) -> bool:
         """Add a job to the job store while also checking to see what uids can be assigned to the job.
         If uids are not provided, then the function will sample random uids from the network.
@@ -255,16 +215,6 @@ async def add_k_synthetic_jobs(self, k: int):
             await self.add_job(job_event=job_event)
             await asyncio.sleep(0.01)
 
-    async def update_scores_wrapper(
-        self, rewards: torch.FloatTensor, hotkeys: List[str]
-    ):
-        """Wrapper function to update the scores of the miners based on the rewards they received."""
-        uids = self.get_uids(hotkeys=hotkeys)
-        await self.update_scores(
-            rewards=rewards,
-            uids=uids,
-        )
-
     async def update_job(self, job: Job):
         """Updates the job status based on the event information
 
@@ -523,9 +473,9 @@ async def read_and_update_rewards(self):
                 )
                 continue
 
-            await self.update_scores_wrapper(
+            await self.update_scores(
                 rewards=torch.Tensor(inactive_job.computed_rewards),
-                hotkeys=inactive_job.hotkeys,
+                uids=inactive_job.event["uids"],
             )
             await asyncio.sleep(0.01)
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "folding"
-version = "2.3.2"
+version = "2.3.3"
 description = "Macrocosmos Subnet 25: Folding"
 authors = ["Brian McCrindle <[email protected]>", "Sergio Champoux <[email protected]>", "Szymon Fonau <[email protected]>"]