Update hpu_model_runner.py

Author: slokesha

vllm_gaudi/v1/worker/hpu_model_runner.py

@@ -4773,14 +4773,6 @@ def _get_mm_dummy_batch(
                 height=h  # Custom height in pixels
             )
             batch = img_count
-<<<<<<< HEAD
-        processor = self.mm_registry.create_processor(model_config=self.model_config, cache=self.mm_budget.cache)
-        profiler: MultiModalProfiler = MultiModalProfiler(processor)
-        dummy_data = profiler.get_decoder_dummy_data(seq_len=4096,
-                                                     mm_counts={"image": img_count},
-                                                     mm_options={"image": image_options})
-        dummy_mm_data = dummy_data.multi_modal_data
-=======
 
         processor = self.mm_registry.create_processor(model_config=self.model_config, cache=self.mm_budget.cache)
         dummy_data = processor.dummy_inputs.get_decoder_dummy_data(processor,
@@ -4792,8 +4784,6 @@ def _get_mm_dummy_batch(
             seq_len=4096,
             mm_counts={"image": img_count},
         )
-        '''
->>>>>>> 04ce358 (fix dummy mm data init)
 
         assert modality == 'image'
         # Result in the maximum GPU consumption of the model