Merge pull request #276 from macrocosm-os/staging

Author: Sarkosos

folding/__init__.py

@@ -1,7 +1,7 @@
 from .protocol import JobSubmissionSynapse
 from .validators.protein import Protein
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 version_split = __version__.split(".")
 __spec_version__ = (
     (10000 * int(version_split[0]))

folding/base/miner.py

@@ -26,7 +26,7 @@
 from folding.base.neuron import BaseNeuron
 from folding.protocol import PingSynapse
 from folding.utils.config import add_miner_args
-from loguru import logger
+from folding.utils.logger import logger
 
 
 class BaseMinerNeuron(BaseNeuron):
@@ -53,7 +53,10 @@ def __init__(self, config=None):
             )
 
         # The axon handles request processing, allowing validators to send this miner requests.
-        self.axon = bt.axon(wallet=self.wallet, config=self.config, port=self.config.axon.port)
+        self.axon = bt.axon(
+            wallet=self.wallet,
+            config=self.config,
+        )
 
         # Attach determiners which functions are called when servicing a request.
         logger.info(f"Attaching forward function to miner axon.")

folding/base/neuron.py

@@ -30,7 +30,7 @@
 from folding import __OPENMM_VERSION_TAG__
 from folding.utils.ops import OpenMMException, load_pkl, write_pkl
 from folding.mock import MockSubtensor, MockMetagraph
-from loguru import logger
+from folding.utils.logger import logger
 
 
 class BaseNeuron(ABC):

folding/base/simulation.py

@@ -8,7 +8,7 @@
 
 import bittensor as bt
 from folding.utils.opemm_simulation_config import SimulationConfig
-from loguru import logger
+from folding.utils.logger import logger
 
 
 class GenericSimulation(ABC):

folding/base/validator.py

@@ -25,7 +25,7 @@
 import threading
 import bittensor as bt
 from pathlib import Path
-from loguru import logger
+from folding.utils.logger import logger
 
 from typing import List, Optional
 
@@ -71,7 +71,10 @@ def __init__(self, config=None):
 
         # Serve axon to enable external connections.
         if not self.config.neuron.axon_off:
-            self.axon = bt.axon(wallet=self.wallet, config=self.config, port=self.config.axon.port)
+            self.axon = bt.axon(
+                wallet=self.wallet,
+                config=self.config
+            )
             self._serve_axon()
 
         else:
@@ -132,7 +135,9 @@ def set_weights(self):
 
         # Calculate the average reward for each uid across non-zero values.
         # Replace any NaN values with 0.
-        raw_weights = torch.nn.functional.normalize(self.scores, p=1, dim=0).to("cpu").numpy() 
+        raw_weights = (
+            torch.nn.functional.normalize(self.scores, p=1, dim=0).to("cpu").numpy()
+        )
 
         logger.debug("raw_weights", raw_weights)
         logger.debug("raw_weight_uids", self.metagraph.uids)

folding/experiments/sensitivity_analysis.py

@@ -5,7 +5,7 @@
 import time
 import wandb
 from tqdm import tqdm
-from loguru import logger
+from folding.utils.logger import logger
 from pathlib import Path
 from typing import Dict, List
 

folding/miners/folding_miner.py

@@ -26,7 +26,7 @@
     write_pkl,
 )
 from folding.utils.opemm_simulation_config import SimulationConfig
-from loguru import logger
+from folding.utils.logger import logger
 
 # root level directory for the project (I HATE THIS)
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

folding/mock.py

@@ -5,7 +5,7 @@
 import bittensor as bt
 
 from typing import List
-from loguru import logger
+from folding.utils.logger import logger
 
 
 class MockSubtensor(bt.MockSubtensor):

folding/organic/validator.py

@@ -3,7 +3,7 @@
 import random
 import asyncio
 import bittensor as bt
-from loguru import logger
+from folding.utils.logger import logger
 
 from typing import Any, Literal, Union, Tuple
 

folding/protocol.py

@@ -19,7 +19,7 @@
 import typing
 import base64
 import bittensor as bt
-from loguru import logger
+from folding.utils.logger import logger
 
 from folding.utils.opemm_simulation_config import SimulationConfig
 

folding/rewards/reward_pipeline.py

@@ -2,7 +2,7 @@
 import bittensor as bt
 from folding.store import Job
 from folding.rewards.linear_reward import divide_decreasing
-from loguru import logger
+from folding.utils.logger import logger
 
 
 async def reward_pipeline(